优化

src/view/performance/12-orderAccounting/index.vue

@@ -8,9 +8,6 @@
 
           <!-- 弹窗 -->
           <div>
-           
-          
-         
 
           </div>
         </div>
@@ -34,7 +31,7 @@
           <!-- 上方列表 -->
           <div class="gva-table-box">
             <el-table
-              style="width: 100%; height: 30vh"
+              style="width: 100%; height: 35vh"
               :data="tableData1"
               row-key="ID"
               highlight-current-row
@@ -46,16 +43,8 @@
               :header-row-style="{ height: '20px' }"
               :header-cell-style="{ padding: '0px' }"
               @row-click="showOrderSuperLossGy"
-              @current-change="
-                (row, oldRow) => {
-                  currentRow = row;
-                }
-              "
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-              />
+              @current-change="(row, oldRow) => {currentRow = row;}">
+              <el-table-column type="selection" width="55"/>
               <!-- 使用 v-for 循环渲染每一列 -->
               <el-table-column
                 v-for="column in tableCols1"
@@ -63,9 +52,9 @@
                 :prop="column.prop"
                 :label="column.label"
                 :width="column.width"
-				:align='column.left'
-				:fixed='column.fixed'
-				:sortable="column.sortable"
+                :align='column.left'
+                :fixed='column.fixed'
+                :sortable="column.sortable"
                 show-overflow-tooltip="true"
                 sortable
               />
@@ -184,17 +173,7 @@ const tableCols1 = [
   { label: '入仓数量', prop: 'warehousing_num', width: '110' ,sortable:'sortable'},
   { label: '目标合格率', prop: 'target_rate', width: '120' ,sortable:'sortable'},
   { label: '实际合格率', prop: 'real_rate', width: '120' ,sortable:'sortable'},
-  // { label: '奖惩系数', prop: 'reward_rate', width: '110' ,sortable:'sortable'},
-  // { label: '奖罚金额合计', prop: 'reward_money', width: '140',sortable:'sortable' },
   { label: '废品合计', prop: '废品合计', width: '120' ,sortable:'sortable'},
-  // { label: '工单无形损', prop: '工单无形损', width: '120',sortable:'sortable' },
-  // { label: '材料废', prop: '材料废', width: '120' ,sortable:'sortable'},
-  // { label: '零头处理', prop: '零头处理', width: '120',sortable:'sortable' },
-  // { label: '处发废', prop: '外发废', width: '120',sortable:'sortable' },
-  // { label: '外摊废', prop: '分摊废', width: '120' ,sortable:'sortable'},
-  // { label: '工单计划损耗', prop: '工单计划损耗', width: '140',sortable:'sortable' },
-  // { label: '工单制程废', prop: 'zcfp', width: '120',sortable:'sortable' },
-  // { label: '工单检验废', prop: '工单质检废', width: '120',sortable:'sortable' },
   { label: '年月', prop: 'date', width: '120' ,sortable:'sortable'},
 ]
 const tableCols2 = [
@@ -204,12 +183,9 @@ const tableCols2 = [
   { label: '联数', prop: 'Gy0_ls', width: '80' },
   { label: '基础损耗', prop: 'Gy0_Rate0', width: '120' },
   { label: '损耗率', prop: 'Gy0_Rate1', width: '120' },
-  // { label: '损耗系数', prop: '损耗系数', width: '120' },
-  // { label: '计损色数', prop: 'Gy0_ms', width: '120' },
   { label: '计划产量', prop: 'Gy0_计划接货数', width: '120' },
   { label: '计划损耗', prop: 'Gy0_计划损耗', width: '120' },
   { label: '上报产量', prop: 'total_cl', width: '120' },
-  // { label: '制程废', prop: 'total_fp', width: '120' },
 ]
 const tableData1 = ref([])
 const tableData2 = ref([])

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -15,6 +15,7 @@
               <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工序资料" >新增工序资料</el-button>
               <el-button type="primary" icon="edit"   @click="del_ddzlClick" 	v-if="table_del=== true" :disabled="table_Selection === ''"  class="bt" title="删除订单资料"  >删除订单资料</el-button>
               <el-button type="primary" icon="edit"   @click="delgd_delclick" 	v-if="delall=== true" :disabled="ysSelection === '' && gySelection === ''"  class="bt"   >删除颜色工艺资料</el-button>
+              <el-button type="primary" icon="edit"   @click="CSclick"   class="bt"   title="库存测试">库存测试</el-button>
 			</el-form-item>
           </el-form>
         </div> 
@@ -184,10 +185,9 @@
                           :show-overflow-tooltip="true"
                           :cell-class-name="planUsageCellClass"
                           highlight-current-row="true"
-                          @row-dblclick="gdbomupdateCompanyFunc"
+                          @row-dblclick="bombomupdateCompanyFunc"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
-                  <el-table-column align="left" label="方案" prop="方案"  width="120"/>
                   <el-table-column align="left" label="物料编号" prop="物料编号"  width="100"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="400"/>
                   <el-table-column align="left" label="消耗定量" prop="消耗定量"  width="210"/>
@@ -198,7 +198,7 @@
                 </el-table>
               </el-tab-pane>
 
-              <el-tab-pane label="面料资料" @click="showTable('面料资料')" name="seven">
+              <el-tab-pane label="面料库存" @click="showTable('面料库存')" name="seven">
                 <el-table ref="multipleTable"
                           :row-style="{ height: '20px' }"
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -206,15 +206,15 @@
                           :show-overflow-tooltip="true"
                           :cell-class-name="planUsageCellClass"
                           highlight-current-row="true"
-                          @row-dblclick="gdbomupdateCompanyFunc"
+                          @row-dblclick="mlupdateCompanyFunc"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="mltableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
                   <el-table-column align="left" label="面料" prop="面料"  width="240"/>
                   <el-table-column align="left" label="面料编号" prop="面料编号"  width="100"/>
                   <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
                   <el-table-column align="left" label="入库数量" prop="入库数量"  width="210"/>
-                  <el-table-column align="left" label="领料数量" prop="领料数量"  width="100" />
-                  <el-table-column align="left" label="剩余数量" prop="剩余数量"  width="120"/>
+                  <el-table-column align="left" label="领用数量" prop="领用数量"  width="100" />
+                  <el-table-column align="left" label="库存数量" prop="库存数量"  width="120"/>
                   <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
                   <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
                 </el-table>
@@ -936,6 +936,42 @@
 			  </template>
 			</el-dialog>
 
+      <!-- 面料库存弹窗 -->
+      <el-dialog v-model="mlinventoryVisible" :before-close="mlcloseDialog" title="面料库存出入库记录" 
+					style="margin-top: 40px" height="300px" width="1000px" destroy-on-close>
+			  <el-form :model="mlformdata" label-position="right" ref="elFormRef" :rules="rule" label-width="90px">
+          <el-table
+      ref="table"
+      highlight-current-row
+      show-overflow-tooltip
+      border
+      :data="historytableData"
+      :row-style="{ height: '25px' }"
+      :cell-style="{ padding: '0px' }"
+      :header-row-style="{ height: '20px' }"
+      :header-cell-style="{ padding: '0px' }"
+      style="width: 100%;height: 75vh;"
+    >
+
+      <el-table-column label="订单编号" prop="订单编号"width="110" ></el-table-column>
+      <el-table-column label="面料" prop="面料" width="110"></el-table-column>
+      <el-table-column label="颜色" prop="颜色" width="110"></el-table-column>
+      <el-table-column label="入库数量" prop="入库数量" width="110"></el-table-column>
+      <el-table-column label="出库数量" prop="出库数量" width="110"></el-table-column>
+      <el-table-column label="领料部门" prop="领料部门" width="110"></el-table-column>
+      <el-table-column label="领料时间" prop="领料时间" width="110"></el-table-column>
+    </el-table>
+				<br>
+			  </el-form>
+			  <template #footer>
+				  <br>
+				<div class="dialog-footer">
+				  <el-button @click="mlcloseDialog">取 消</el-button>
+				  <el-button type="primary"  @click="mlenterDialog">确 定</el-button>
+				</div>
+			  </template>
+			</el-dialog>
+
           </el-main>
         </layout-content>
       </layout>
@@ -1419,8 +1455,22 @@ function buildSizeQuantitiesMap(sizes, formData) {
 const ys_edit_closeDialog = async (row) => {
 	dialogFormVisible.value = false;
 };
+const mlinventoryVisible = ref(false)
+const historytableData = ref([])
+//双击面料库存
+const mlupdateCompanyFunc = async (row) => {
+  mlinventoryVisible.value = true;
+}
 
+//库存测试
+const CSclick = async (row) => {
+  mlinventoryVisible.value = true;
+}
 
+//技术附件弹窗取消
+const mlcloseDialog = () => {
+  mlinventoryVisible.value = false
+}
 // 分页
 const page = ref(1)
 const total = ref(0)
@@ -1955,6 +2005,8 @@ const tableRowClick = async (row) => {
 	gytableData.splice(0, gytableData.length);
 	ddtableData.splice(0, ddtableData.length);
 	jstableData.splice(0, jstableData.length);
+  bomtableData.splice(0, bomtableData.length);
+  mltableData.splice(0, mltableData.length);
     _Gd_gdbh.value = row.订单编号
     _ddhval.value = row.订单编号
     try {
@@ -1962,7 +2014,7 @@ const tableRowClick = async (row) => {
         const PrintListDatas = await PrintListData({order:_Gd_gdbh.value})
         const jsOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'技术附件'})
         const ddOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'订单资料附件'})
-		
+
 		//颜色资料
         if(PrintListDatas.data.列表.length === 0 ){
           ystableData.length = 0
@@ -1987,7 +2039,7 @@ const tableRowClick = async (row) => {
         }
     //BOM资料
 
-    //面料资料
+    //面料库存
       } catch (error) {
         console.error(error);
     }