Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/productionManagement/components/addDialog.vue

@@ -14,7 +14,7 @@
       <el-descriptions-item label="建立人员">{{ addForm.createUserName }}</el-descriptions-item>
       <el-descriptions-item label="建立时间">{{ addForm.createTime }}</el-descriptions-item>
 
-      <el-descriptions-item label="物料编码">{{ addForm.plateGoodsCode }}</el-descriptions-item>
+      <el-descriptions-item label="物料编码">{{ addForm.goodsCode }}</el-descriptions-item>
       <el-descriptions-item label="班组实际消耗(克)">{{
         addForm.teamActualConsumption
       }}</el-descriptions-item>
@@ -29,10 +29,10 @@
         addForm.accumulatedBalanceGram
       }}</el-descriptions-item>
       <el-descriptions-item label="本次添加涉及单号">{{
-        addForm.involveCode
+        addForm.involvingRecordCode
       }}</el-descriptions-item>
       <el-descriptions-item label="本次剩余单号余量">{{
-        addForm.involveCode
+        addForm.involvingSurplus
       }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions
@@ -40,20 +40,20 @@
       :column="4"
       border
       title="审批信息"
-      v-if="addForm.bsWorkCenter"
+      v-if="addForm.status != 10000"
     >
-    <template v-for="(item,index) in addForm.bsWorkCenter" :key="index">
+    <template>
       <el-descriptions-item label="审批人">{{
-        item.approvalMan
+        addForm.approvalManName
       }}</el-descriptions-item>
       <el-descriptions-item label="审批时间">{{
-        item.approvalTime
+        addForm.approvalTime
       }}</el-descriptions-item>
       <el-descriptions-item label="审批结果">{{
-        item.statusName
+        addForm.approvalStatusName
       }}</el-descriptions-item>
       <el-descriptions-item label="审批意见">{{
-        item.approvalMemo
+        addForm.approvalMemo
       }}</el-descriptions-item>
       </template> 
     </el-descriptions>
@@ -95,46 +95,15 @@ export default {
   methods: {
     async open() {
       //接口暂无
-      console.log(this.id, 'zz');
       try {
         const ref = await getOrderMoldPlanCaDeatils({ id: this.id });
-        if (res.code == 200) {
+        if (ref.data.code == 200) {
-          this.detailForm = res.data.detailForm;
+          this.addForm = ref.data.data;
-          this.tableData = res.data.list;
+          this.tableData = ref.data.data.yieldOrderList;
         }
       } catch (err) {
         console.log(err);
       }
-      this.addForm = {
-        bsWorkCenter:[ {
-          wcName: '电镀作业中心A区',
-          approvalMan: '张三（车间主管）',
-          approvalTimeFirst: '2025-12-01 09:30:25',
-          approvalResultFirst: '通过',
-          approvalOpinionFirst: '物料消耗数据核对无误，预添加量在定额范围内，同意审批',
-          approverSecond: '李四（生产经理）',
-          approvalTime: '2025-12-01 14:15:40',
-          approvalMemo: '通过',
-          approvalOpinionSecond: '同意车间主管意见，按计划执行物料添加',
-          approvalStatus:""
-        }],
-        createUser: '王五（统计员）',
-        createTime: '2025-11-30 16:20:10',
-        goodsCode: 'WL-DJ-001-2025',
-        teamActualConsumption: 1856.7,
-        teamPreAddGram: 2000.0,
-        goodsName: '氰化金钾溶液（20%）',
-        usableQuotaGram: 4500.5,
-        accumulatedBalanceGram: 987.2,
-        currentAddRelatedOrderNo: 'OD-202512001',
-        currentRemainingOrderQuota: 1560.8,
-      };
-      this.tableData = [
-        { slot: 5, testVal: 1.85, saveGoldVal: 0.0, saveSilverVal: 850.2, saveBoardVal: 848.5 },
-        { slot: 6, testVal: 1.88, saveGoldVal: 0.0, saveSilverVal: 880.7, saveBoardVal: 879.2 },
-        { slot: 7, testVal: 1.82, saveGoldVal: 0.0, saveSilverVal: 820.4, saveBoardVal: 819.0 },
-        { slot: 8, testVal: 1.86, saveGoldVal: 0.0, saveSilverVal: 860.9, saveBoardVal: 859.3 },
-      ];
     },
     closeDialog() {
       this.$emit('closeDialog');

src/views/productionManagement/components/coatingMater/addRequirements.vue

@@ -46,8 +46,8 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="danger" @click="approveDialog = false">不通过</el-button>
+          <el-button @click="approveDialog = false">取消</el-button>
-          <el-button type="primary" @click="submitApprove">通过</el-button>
+          <el-button type="primary" @click="submitApprove">确定</el-button>
         </span>
       </template>
     </el-dialog>
@@ -117,7 +117,211 @@ export default {
         gridBtn: false,
         searchMenuPosition: 'right',
         align: 'center',
-        column: [],
+        column: [
+          {
+            label: '需求单号',
+            prop: 'demandCode',
+            span: 24,
+            overflow: true,
+            search: true,
+            headerAlign: 'center',
+            align: 'center',
+            searchLabelWidth: 80,
+            rules: [
+              {
+                required: true,
+                message: '请输入需求单号',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '作业中心',
+            prop: 'wcId',
+            span: 24,
+            type: 'select',
+            width: 150,
+            overflow: true,
+            search: true,
+            headerAlign: 'center',
+            align: 'center',
+            searchLabelWidth: 80,
+            rules: [
+              {
+                required: true,
+                message: '请输入作业中心',
+                trigger: 'blur',
+              },
+            ],
+            dicUrl: '/blade-desk/bsWorkCenter/getList',
+            props: {
+              label: 'wcName',
+              value: 'id',
+            },
+          },
+          {
+            label: '物料编号',
+            prop: 'goodsCode',
+            span: 24,
+            width: 150,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            rules: [
+              {
+                required: true,
+                message: '请输入物料编号',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '物料名称',
+            prop: 'goodsName',
+            span: 24,
+            width: 150,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            rules: [
+              {
+                required: true,
+                message: '请输入物料名称',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '镀层物料需求(克)',
+            prop: 'goodsDemand',
+            span: 24,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            width: 160,
+            rules: [
+              {
+                required: true,
+                message: '请输入金钾申报量(克)',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '已使用(克)',
+            prop: 'usedGoldVal',
+            span: 24,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            rules: [
+              {
+                required: true,
+                message: '请输入金钾申报量(克)',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '申报量(克)',
+            prop: 'declaredQuota',
+            span: 24,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            rules: [
+              {
+                required: true,
+                message: '请输入银钾申报量(克)',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '剩余量(克)',
+            prop: 'surplus',
+            span: 24,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            rules: [
+              {
+                required: true,
+                message: '请输入银板申报量(克)',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '状态',
+            prop: 'status',
+            span: 24,
+            overflow: true,
+            search: true,
+            type: 'select',
+            headerAlign: 'center',
+            align: 'center',
+            searchLabelWidth: 50,
+            rules: [
+              {
+                required: true,
+                message: '请输入状态',
+                trigger: 'blur',
+              },
+            ],
+            dicData: [
+              // { label: '待领取', value: 1 },
+              // { label: '已领取', value: 2 },
+              // { label: '已过期', value: 3 },
+              { label: '待审核', value: 10000 },
+              { label: '审核通过', value: 10001 },
+              { label: '使用中', value: 10002 },
+              { label: '审核不通过', value: 10005 },
+              { label: '已完成', value: 10004 },
+              { label: '已超期', value: 10003 },
+              { label: '已关闭', value: 10006 },
+            ],
+          },
+          {
+            label: '创建人',
+            prop: 'createUserName',
+            span: 24,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            rules: [
+              {
+                required: true,
+                message: '请输入申报人',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '创建时间',
+            prop: 'createTime',
+            span: 24,
+            overflow: true,
+            search: false,
+            headerAlign: 'center',
+            align: 'center',
+            width:160,
+            rules: [
+              {
+                required: true,
+                message: '请输入创建时间',
+                trigger: 'blur',
+              },
+            ],
+          },
+        ],
       },
       approveRules: {
         approvalStatus: [{ required: true, message: '请选择审批结果', trigger: 'blur' }],
@@ -130,17 +334,17 @@ export default {
         total: 0,
       },
       selectionList: [],
-      query:{}
+      query: {},
     };
   },
   mounted() {
-    this.option.column = coatingColumnData[this.tabPosition];
+    // this.option.column = coatingColumnData[this.tabPosition];
   },
   methods: {
     // 待审核搜索
     pendingReviewFn() {
-      this.query.status = 10000
+      this.query.status = 10000;
-      this.onLoad()
+      this.onLoad();
       // this.onLoad(this.page, { type: '2' });
     },
     searchReset() {
@@ -159,7 +363,7 @@ export default {
     },
     // 点击详情
     handleView(row) {
-      this.id=row.id
+      this.id = row.id;
       this.addDialog = true;
     },
     deleteRow(row) {
@@ -186,7 +390,7 @@ export default {
       this.addQuantity = false;
       this.addDialog = false;
       if (val) {
-        this.onLoad()
+        this.onLoad();
       }
     },
     addQuantityClick() {
@@ -204,11 +408,16 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     handleApprove() {
-      if (this.selectionList.length != 0) {
+      if(this.selectionList.length == 0){
-        this.approveDialog = true;
-      } else {
         this.$message.error('请至少选择一条数据!');
+        return
+      }
+      let tmp = this.selectionList.find(item => item.status != 10000)
+      if(tmp){
+        this.$message.error('请选择状态为【待审核】的数据')
+        return
       }
+      this.approveDialog = true;
     },
     submitApprove() {
       this.$refs.approveForm.validate(valid => {
@@ -223,20 +432,19 @@ export default {
               this.onLoad();
             }
           });
-          this.approveDialog = false;
+          // this.approveDialog = false;
-          this.$refs.crud.toggleSelection();
+          // this.$refs.crud.toggleSelection();
-          this.onLoad(this.page);
+          // this.onLoad(this.page);
         }
       });
     },
     async onLoad(page, params = {}) {
-      
       try {
         this.loading = true;
         const res = await getList({
           current: this.page.currentPage,
           size: this.page.pageSize,
-          ...this.query
+          ...this.query,
         });
         // if (res.code) {
         this.data = res.data.data.records;