生产报工

package.json

@@ -42,6 +42,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "^3.21.1",
+    "dayjs": "^1.11.11",
     "dhtmlx-gantt": "^7.1.11",
     "echarts": "4.9.0",
     "element-ui": "2.15.6",

src/views/mes/pro/feedback/index.vue

@@ -286,10 +286,20 @@
               <el-input readonly="readonly" v-model="form.quantityFeedback" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="待检测数量" prop="quantityUncheck">
               <el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUncheck" placeholder="请输入待检测数量" />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="加工时间" prop="machineTime">
+              <el-date-picker clearable
+                v-model="form.machineTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择加工时间">
+              </el-date-picker>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -347,6 +357,7 @@ import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.
 import UserSingleSelect from "@/components/userSelect/single.vue"
 import ProtaskSelect from "@/components/TaskSelect/taskSelectSingle.vue"
 import assistProcessSelect from "./components/assistProcessSelect.vue"
+import dayjs from 'dayjs'
 export default {
   name: "Feedback",
   components: {WorkorderSelect,WorkstationSelect,UserSingleSelect,ProtaskSelect,assistProcessSelect},
@@ -396,10 +407,11 @@ export default {
         quantityFeedback: null,
         quantityQualified: null,
         quantityUnquanlified: null,
+        feedbackTime: null,
         userName: null,
         nickName: null,
         feedbackChannel: null,
-        feedbackTime: null,
+        machineTime: null,
         recordUser: null,
         recordNick: null,
         status: null,
@@ -488,14 +500,14 @@ export default {
         assistProcessCode: null,
         closeType: 0,
         quantity: 0,
-        quantityUncheck: 0,
+        machineTime: dayjs().format('YYYY-MM-DD'),
         quantityFeedback: 0,
         quantityQualified: 0,
         quantityUnquanlified: 0,
         userName: null,
         nickName: null,
         feedbackChannel: null,
-        feedbackTime: new Date(),
+        feedbackTime: dayjs().format('YYYY-MM-DD'),
         recordUser: null,
         recordNick: null,
         status: "PREPARE",
@@ -512,7 +524,7 @@ export default {
       this.resetForm("form");
     },
     handleQuantityChanged(){
-      this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified + this.form.quantityUncheck;
+      this.form.quantityFeedback = this.form.quantityQualified + this.form.quantityUnquanlified;
     },
     /** 搜索按钮操作 */
     handleQuery() {