修改bug

src/enum/dict.js

@@ -42,7 +42,6 @@ export default {
   取样类型: 'quality_method_code',
   放行类型: 'checklist_type',
   文档类型: 'doc_type'
-
 };
 export const numberList = ['date_method'];
 

src/views/InTheSystem/components/tg-details-search.vue

@@ -180,7 +180,9 @@
         specification: '',
         materielDesignation: '',
         engrave: '',
-        times: []
+        times: [],
+        startTime: '',
+        endTime: ''
       };
 
       return {
@@ -204,9 +206,13 @@
       /* 搜索 */
       search() {
         const where = { ...this.where };
+        console.log(where, 'wherewherewhere');
         if (where.times?.length) {
-          where.startTime = where.times[0];
-          where.endTime = where.times[1];
+          this.where.startTime = where.times[0];
+          this.where.endTime = where.times[1];
+        } else {
+          this.where.startTime = '';
+          this.where.endTime = '';
         }
         delete where.times;
 

src/views/operationControl/index.vue

@@ -13,13 +13,25 @@
             <el-descriptions-item label="日期方式">
               <span slot="label" class="label-required">日期方式</span>
               <el-form-item prop="formingNum">
-                <DictSelection
+                <!-- <DictSelection
                   dictName="日期方式"
                   clearable
                   v-model="formData.dateType"
                   @change="changeType"
                 >
-                </DictSelection>
+                </DictSelection> -->
+                <el-select
+                  v-model="formData.dateType"
+                  @change="changeType"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dateTypeList"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-descriptions-item>
             <el-descriptions-item v-if="formData.dateType == 2">
@@ -85,6 +97,7 @@
     controlSave,
     controlUpdate
   } from '@/api/operationControl/index.js';
+  import { getByCode } from '@/api/system/dictionary-data';
   export default {
     mixins: [dictMixins],
     data() {
@@ -104,12 +117,14 @@
           appointTime: [
             { required: true, message: '请选择指定日期', trigger: 'change' }
           ]
-        }
+        },
+        dateTypeList: []
       };
     },
     computed: {},
     async created() {
       this.getInfoData();
+      this.getDateType('date_method');
     },
     methods: {
       changeType(val) {
@@ -120,6 +135,20 @@
           this.$set(this.formData, 'appointTime', time);
         }
       },
+
+      async getDateType(code) {
+        let { data: res } = await getByCode(code);
+        this.dateTypeList = res.map((item) => {
+          let values = Object.keys(item);
+          return {
+            value: Number(values[0]),
+            label: item[values[0]]
+          };
+        });
+
+        console.log(this.dateTypeList);
+      },
+
       async getInfoData() {
         const res = await getInfo();
         if (typeof res == 'string') {

src/views/produce/components/feeding/components/modelBom.vue

@@ -85,17 +85,19 @@
           if (newVal) {
             let formedNum = 0;
             let notFormedNum = 0;
-            if (newVal.workReportInfo.formedNum) {
-              formedNum = Number(newVal.workReportInfo.formedNum);
-            }
-            if (newVal.workReportInfo.notFormedNum) {
-              notFormedNum = Number(newVal.workReportInfo.notFormedNum);
-            }
-            const totalNum = formedNum + notFormedNum;
+            if (newVal.workReportInfo) {
+              if (newVal.workReportInfo.formedNum) {
+                formedNum = Number(newVal.workReportInfo.formedNum);
+              }
+              if (newVal.workReportInfo.notFormedNum) {
+                notFormedNum = Number(newVal.workReportInfo.notFormedNum);
+              }
+              const totalNum = formedNum + notFormedNum;
 
-            this.list.forEach((it, index) => {
-              this.$set(this.list[index].extInfo, 'cyTimes', totalNum);
-            });
+              this.list.forEach((it, index) => {
+                this.$set(this.list[index].extInfo, 'cyTimes', totalNum);
+              });
+            }
           }
         },
         immediate: true,

src/views/produce/components/picking/detailed.vue

@@ -77,6 +77,11 @@
             {{ row.demandQuantity }} {{ row.unit }}
           </template>
 
+          <template v-slot:specification="{ row }">
+            <span>{{
+              row.specification ? row.specification : row.specifications
+            }}</span>
+          </template>
           <!-- 操作列 -->
           <template v-slot:action="{ row, $index }">
             <el-link
@@ -241,6 +246,7 @@
           },
           {
             prop: 'specification',
+            slot: 'specification',
             label: '规格',
             align: 'center',
             showOverflowTooltip: true

vue.config.js

@@ -34,9 +34,9 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086', // 赵沙金
-        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',