生产工单

src/views/productManagement/assetBasicInfo/index.vue

@@ -593,10 +593,26 @@ import { getToken } from '@/utils/auth'
           this.fileList= [];
         },
          handleEditAndOff(){
-           this.handleEdit();
+           this.handleEdit1();
+             this.dialogFormVisible = false;
            },
-        handleEdit(){
+        handleEdit1(){
+
+
+        const  code = this.formLabelAlign.goodsUnit;
+        const  id  = this.formLabelAlign.goodsUnitId;
+        console.log("goodsCode : ",code);
+        console.log("goodsTypeId : ",id);
+
+        if (typeof code === 'number') {
+         this.formLabelAlign.goodsUnit = code ;
+        } else {
+          this.formLabelAlign.goodsUnit = id ;
+        }
+
+
           const requestParam = this.buildUpdateRequest();
+          console.log(requestParam);
              ExecDataByConfig(requestParam).then(response => {
                if (response.msg !== 'fail') {
                  this.resetInsertForm();
@@ -925,19 +941,24 @@ this.isView = false;
           return `${year}-${month}-${day}`;
         },
     handleGet(row){
-     this.dialogTitle = "查看货品"
+     this.dialogTitle = "查看货品";
      this.isView = true;
       this.dialogFormVisible = true;
+  this.formLabelAlign.id = row.id;
+      this.formLabelAlign.goodsModel = row.goodsModel;
+      this.formLabelAlign.goodsImage = row.goodsImage;
+      this.formLabelAlign.goodsTypeId = row.goodsTypeId;
       this.formLabelAlign.goodsCode = row.goodsCode;
       this.formLabelAlign.goodsName = row.goodsName;
       this.formLabelAlign.goodsSpecification = row.goodsSpecification;
       this.formLabelAlign.purpose = row.purpose;
+       this.formLabelAlign.goodsEnabled = row.goodsEnabled;
       this.formLabelAlign.date = row.createTime;
       this.formLabelAlign.remarks = row.remarks;
       this.defaultCheckedKeys = [row.goodsTypeId];
-  this.formLabelAlign.createrId   = row.createrId;
+  this.formLabelAlign.createrId = row.createrId;
    this.formLabelAlign.goodsUnitId=  row.goodsUnitId;
-   this.formLabelAlign.goodsUnit = row.goodsUnit
+   this.formLabelAlign.goodsUnit = row.goodsUnit;
    this.dialogImageUrl =   row.goodsImagePath;
       const fileList = [];
         var urlObj = { "url": "", "response": { "execresult": { "LastInsertId": "" } } };
@@ -950,9 +971,14 @@ this.isView = false;
 
 
     handleEdit(row){
-      this.dialogTitle = "查看货品"
+      this.dialogTitle = "修改货品";
      this.isEdit = true;
       this.dialogFormVisible = true;
+      this.formLabelAlign.id = row.id;
+     this.formLabelAlign.goodsEnabled = row.goodsEnabled;
+      this.formLabelAlign.goodsModel = row.goodsModel;
+      this.formLabelAlign.goodsImage = row.goodsImage;
+      this.formLabelAlign.goodsTypeId = row.goodsTypeId;
       this.formLabelAlign.goodsCode = row.goodsCode;
       this.formLabelAlign.goodsName = row.goodsName;
       this.formLabelAlign.goodsSpecification = row.goodsSpecification;
@@ -961,8 +987,10 @@ this.isView = false;
       this.formLabelAlign.remarks = row.remarks;
       this.defaultCheckedKeys = [row.goodsTypeId];
   this.formLabelAlign.createrId = row.createrId;
+
    this.formLabelAlign.goodsUnitId=  row.goodsUnitId;
-   this.formLabelAlign.goodsUnit = row.goodsUnit
+   this.formLabelAlign.goodsUnit = row.goodsUnit;
+
    this.dialogImageUrl =   row.goodsImagePath;
       const fileList = [];
         var urlObj = { "url": "", "response": { "execresult": { "LastInsertId": "" } } };

src/views/productManagement/productionWorkOrder/index.vue

@@ -0,0 +1,130 @@
+<template>
+  <div>
+    <h2>生产进度表</h2>
+    <el-table :data="tableData" style="width: 100%">
+      <el-table-column prop="serialNumber" label="序号" width="80"></el-table-column>
+      <el-table-column prop="productionNumber" label="生产编号" width="120"></el-table-column>
+      <el-table-column prop="product" label="商品" width="120"></el-table-column>
+      <el-table-column prop="version" label="收汽版" width="100"></el-table-column>
+      <el-table-column prop="totalQuantity" label="总数量" width="100"></el-table-column>
+      <el-table-column prop="producedQuantity" label="已生产数量" width="120"></el-table-column>
+      <el-table-column prop="remainingQuantity" label="剩余值" width="100"></el-table-column>
+      <el-table-column prop="productionProgress" label="生产进度" width="100"></el-table-column>
+      <el-table-column prop="orderBy" label="下单人" width="100"></el-table-column>
+      <el-table-column prop="orderTime" label="下单时间" width="150"></el-table-column>
+      <el-table-column prop="orderCompletionTime" label="按单时间" width="150"></el-table-column>
+      <el-table-column prop="preparationCompletionTime" label="预制完成时间" width="150"></el-table-column>
+      <el-table-column prop="dailyCompletionRate" label="正常批的完成率/天" width="150"></el-table-column>
+      <el-table-column prop="actualCompletionTime" label="实际完成时间" width="150"></el-table-column>
+      <el-table-column prop="status" label="处理状态" width="120"></el-table-column>
+      <el-table-column prop="remarks" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          serialNumber: 1,
+          productionNumber: 'B20120030100',
+          product: '轿车车轮换发厂',
+          version: '高色',
+          totalQuantity: 10000,
+          producedQuantity: 6000,
+          remainingQuantity: 4000,
+          productionProgress: '60%',
+          orderBy: '3pcs',
+          orderTime: '2024-10-25 15:00',
+          orderCompletionTime: '2024-10-25 18:00',
+          preparationCompletionTime: '2024-11-08',
+          dailyCompletionRate: '2',
+          actualCompletionTime: '',
+          status: '待售单',
+          remarks: ''
+        },
+        {
+          serialNumber: 2,
+          productionNumber: 'B20120030100',
+          product: '轿车',
+          version: '高色',
+          totalQuantity: 10000,
+          producedQuantity: null,
+          remainingQuantity: null,
+          productionProgress: '3pcs',
+          orderBy: '3pcs',
+          orderTime: '2024-09-20 16:00',
+          orderCompletionTime: '2024-09-20 18:00',
+          preparationCompletionTime: '2024-10-08',
+          dailyCompletionRate: '',
+          actualCompletionTime: '2024-10-10',
+          status: '按单记录',
+          remarks: ''
+        },
+        {
+          serialNumber: 3,
+          productionNumber: 'B20120030100',
+          product: '轿车',
+          version: '高色',
+          totalQuantity: 10000,
+          producedQuantity: 1000,
+          remainingQuantity: 5000,
+          productionProgress: '10%',
+          orderBy: '3pcs',
+          orderTime: '2024-08-14 15:00',
+          orderCompletionTime: '2024-08-14 17:00',
+          preparationCompletionTime: '2024-09-08',
+          dailyCompletionRate: '10',
+          actualCompletionTime: '2024-09-08',
+          status: '生产中',
+          remarks: ''
+        },
+        {
+          serialNumber: 4,
+          productionNumber: 'B20120030100',
+          product: '轿车',
+          version: '高色',
+          totalQuantity: 10000,
+          producedQuantity: 5000,
+          remainingQuantity: 9990,
+          productionProgress: '5%',
+          orderBy: '3pcs',
+          orderTime: '2024-07-08 15:00',
+          orderCompletionTime: '2024-07-08 19:00',
+          preparationCompletionTime: '2024-08-08',
+          dailyCompletionRate: '20',
+          actualCompletionTime: '',
+          status: '生产中',
+          remarks: ''
+        },
+        {
+          serialNumber: 4,
+          productionNumber: 'B20120030100',
+          product: '轿车',
+          version: '一般',
+          totalQuantity: 10000,
+          producedQuantity: 0,
+          remainingQuantity: 0,
+          productionProgress: '0%',
+          orderBy: '3pcs',
+          orderTime: '2024-06-05 15:00',
+          orderCompletionTime: '2024-06-05 21:00',
+          preparationCompletionTime: '2024-07-08',
+          dailyCompletionRate: '30',
+          actualCompletionTime: '',
+          status: '已购单',
+          remarks: ''
+        }
+      ]
+    };
+  }
+};
+</script>
+
+<style scoped>
+h2 {
+  margin-bottom: 20px;
+}
+</style>