Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/components/CommomSelect/person-select-remote.vue

@@ -55,7 +55,9 @@
         }
       }
     },
-    created () {},
+    created () {
+      this.remoteMethod('');
+    },
     methods: {
       async remoteMethod (query) {
         this.loading = true;

src/views/produceOrder/components/report/Common.vue

@@ -87,12 +87,18 @@
             ></el-input>
           </el-form-item>
         </el-descriptions-item>
-        <el-descriptions-item label="质检项" :span="2">{{
-          infoData.qualityItem
-        }}</el-descriptions-item>
-        <el-descriptions-item label="质检标准" :span="3">{{
-          infoData.qualityStandard
-        }}</el-descriptions-item>
+        <el-descriptions-item label="质检项" :span="2">
+          <el-input
+            v-model="workReport.qualityItem"
+            placeholder="请输入"
+          ></el-input>
+        </el-descriptions-item>
+        <el-descriptions-item label="质检标准" :span="3">
+          <el-input
+            v-model="workReport.qualityStandard"
+            placeholder="请输入"
+          ></el-input
+        ></el-descriptions-item>
         <el-descriptions-item label="">
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
@@ -202,6 +208,7 @@
   import personSelectRemote from '@/components/CommomSelect/person-select-remote';
   import equipmentDailog from '@/components/EquipmentDailog/equipment-dailog';
   import { reportCount } from '@/api/produceOrder';
+  import dayjs from 'dayjs';
   export default {
     components: { personSelectRemote, equipmentDailog },
     props: {
@@ -227,9 +234,11 @@
           code: ''
         },
         workReport: {
+          qualityStandard: '',
+          qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -249,6 +258,10 @@
         countMsg: {}
       };
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     watch: {
       taskInfo: {
         immediate: true,

src/views/produceOrder/components/report/Drying.vue

@@ -100,12 +100,18 @@
             v-model="boatMsg.extraField.num"
           ></el-input
         ></el-descriptions-item>
-        <el-descriptions-item label="质检项" :span="2">{{
-          infoData.qualityItem
-        }}</el-descriptions-item>
-        <el-descriptions-item label="质检标准" :span="3">{{
-          infoData.qualityStandard
-        }}</el-descriptions-item>
+        <el-descriptions-item label="质检项" :span="2">
+          <el-input
+            v-model="workReport.qualityItem"
+            placeholder="请输入"
+          ></el-input>
+        </el-descriptions-item>
+        <el-descriptions-item label="质检标准" :span="3">
+          <el-input
+            v-model="workReport.qualityStandard"
+            placeholder="请输入"
+          ></el-input
+        ></el-descriptions-item>
         <el-descriptions-item label="">
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
@@ -221,6 +227,7 @@
   import personSelectRemote from '@/components/CommomSelect/person-select-remote';
   import { reportCount } from '@/api/produceOrder';
   import catogaryDialog from '../catogaryDialog.vue';
+  import dayjs from 'dayjs';
   export default {
     components: { personSelectRemote, workshopDailog, catogaryDialog },
     props: {
@@ -246,9 +253,11 @@
           code: ''
         },
         workReport: {
+          qualityStandard: '',
+          qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -283,6 +292,10 @@
         }
       };
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     watch: {},
     methods: {
       getCategory (id, memo) {

src/views/produceOrder/components/report/Extrusion.vue

@@ -1,5 +1,6 @@
 <template>
   <el-form
+    class="form-no-message"
     :model="{ categoryMsg, ...workReport }"
     ref="formRef"
     :show-message="false"
@@ -98,12 +99,18 @@
               placeholder="请输入"
             ></el-input> </el-form-item
         ></el-descriptions-item>
-        <el-descriptions-item label="质检项" :span="2">{{
-          infoData.qualityItem
-        }}</el-descriptions-item>
-        <el-descriptions-item label="质检标准" :span="3">{{
-          infoData.qualityStandard
-        }}</el-descriptions-item>
+        <el-descriptions-item label="质检项" :span="2">
+          <el-input
+            v-model="workReport.qualityItem"
+            placeholder="请输入"
+          ></el-input>
+        </el-descriptions-item>
+        <el-descriptions-item label="质检标准" :span="3">
+          <el-input
+            v-model="workReport.qualityStandard"
+            placeholder="请输入"
+          ></el-input
+        ></el-descriptions-item>
         <el-descriptions-item label="">
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
@@ -264,6 +271,7 @@
   import materialDialog from '../materialDialog.vue';
   import catogaryDialog from '../catogaryDialog.vue';
   import { reportCount } from '@/api/produceOrder';
+  import dayjs from 'dayjs';
   export default {
     components: {
       personSelectRemote,
@@ -293,9 +301,11 @@
           code: ''
         },
         workReport: {
+          qualityItem: '',
+          qualityStandard: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -351,6 +361,10 @@
         }
       }
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     methods: {
       getCategory (id, memo) {
         this.$refs.catogaryDialogRef.open(id, this[memo], (res) => {
@@ -438,6 +452,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    margin-bottom: 16px;
     .label {
       margin-right: 5px;
     }

src/views/produceOrder/components/report/Furnace.vue

@@ -87,6 +87,7 @@
   import personSelectRemote from '@/components/CommomSelect/person-select-remote';
   import equipmentDailog from '@/components/EquipmentDailog/equipment-dailog';
   import { reportCount } from '@/api/produceOrder';
+  import dayjs from 'dayjs';
   export default {
     components: { personSelectRemote, equipmentDailog },
     props: {
@@ -114,7 +115,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           productInfo: {
             standardNum: '',
             standardWeight: '',
@@ -143,6 +144,10 @@
         }
       }
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     methods: {
       async getReportCount () {
         const res = await reportCount({

src/views/produceOrder/components/report/HalfAdded.vue

@@ -99,12 +99,18 @@
             v-model="boatMsg.extraField.num"
           ></el-input
         ></el-descriptions-item>
-        <el-descriptions-item label="质检项" :span="2">{{
-          infoData.qualityItem
-        }}</el-descriptions-item>
-        <el-descriptions-item label="质检标准" :span="3">{{
-          infoData.qualityStandard
-        }}</el-descriptions-item>
+        <el-descriptions-item label="质检项" :span="2">
+          <el-input
+            v-model="workReport.qualityItem"
+            placeholder="请输入"
+          ></el-input>
+        </el-descriptions-item>
+        <el-descriptions-item label="质检标准" :span="3">
+          <el-input
+            v-model="workReport.qualityStandard"
+            placeholder="请输入"
+          ></el-input
+        ></el-descriptions-item>
         <el-descriptions-item label="">
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
@@ -216,6 +222,7 @@
   import equipmentDailog from '@/components/EquipmentDailog/equipment-dailog';
   import { reportCount } from '@/api/produceOrder';
   import catogaryDialog from '../catogaryDialog.vue';
+  import dayjs from 'dayjs';
   export default {
     components: { personSelectRemote, equipmentDailog, catogaryDialog },
     props: {
@@ -241,9 +248,11 @@
           code: ''
         },
         workReport: {
+          qualityStandard: '',
+          qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -285,6 +294,10 @@
         }
       }
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     methods: {
       getCategory (id, memo) {
         this.$refs.catogaryDialogRef.open(id, this[memo], (res) => {

src/views/produceOrder/components/report/Heating.vue

@@ -99,12 +99,18 @@
             v-model="boatMsg.extraField.num"
           ></el-input
         ></el-descriptions-item>
-        <el-descriptions-item label="质检项" :span="2">{{
-          infoData.qualityItem
-        }}</el-descriptions-item>
-        <el-descriptions-item label="质检标准" :span="3">{{
-          infoData.qualityStandard
-        }}</el-descriptions-item>
+        <el-descriptions-item label="质检项" :span="2">
+          <el-input
+            v-model="workReport.qualityItem"
+            placeholder="请输入"
+          ></el-input>
+        </el-descriptions-item>
+        <el-descriptions-item label="质检标准" :span="3">
+          <el-input
+            v-model="workReport.qualityStandard"
+            placeholder="请输入"
+          ></el-input
+        ></el-descriptions-item>
         <el-descriptions-item label="">
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
@@ -222,6 +228,7 @@
   import equipmentDailog from '@/components/EquipmentDailog/equipment-dailog';
   import { reportCount } from '@/api/produceOrder';
   import catogaryDialog from '../catogaryDialog.vue';
+  import dayjs from 'dayjs';
   export default {
     components: { personSelectRemote, equipmentDailog, catogaryDialog },
     props: {
@@ -247,9 +254,11 @@
           code: ''
         },
         workReport: {
+          qualityItem: '',
+          qualityStandard: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -294,6 +303,10 @@
         }
       }
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     methods: {
       getCategory (id, memo) {
         this.$refs.catogaryDialogRef.open(id, this[memo], (res) => {

src/views/produceOrder/components/report/Package.vue

@@ -149,6 +149,7 @@
   import personSelectRemote from '@/components/CommomSelect/person-select-remote';
   import ChooseMaterial from '@/components/material/ChooseMaterial';
   import { reportCount, getPackageList } from '@/api/produceOrder';
+  import dayjs from 'dayjs';
   export default {
     components: {
       ChooseMaterial,
@@ -233,7 +234,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           packInfo: {
             packUnit: '',
             minPackNum: '',
@@ -273,6 +274,10 @@
         }
       }
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     methods: {
       async _getPackageList () {
         const res = await getPackageList(this.infoData.code);

src/views/produceOrder/components/report/Warehousing.vue

@@ -115,6 +115,7 @@
 <script>
   import personSelectRemote from '@/components/CommomSelect/person-select-remote';
   import { reportCount } from '@/api/produceOrder';
+  import dayjs from 'dayjs';
   export default {
     components: { personSelectRemote },
     props: {
@@ -132,7 +133,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           storageInfo: {
             batchNum: '',
             inStorageNum: '',
@@ -163,6 +164,10 @@
         }
       }
     },
+    created () {
+      this.workReport.executorId = this.$store.state.user.info?.userId;
+      this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
+    },
     methods: {
       async getReportCount () {
         const res = await reportCount({