修改质检搜索条件

src/views/produce/components/jobBooking/components/batchSemiProductJobBom.vue

@@ -532,10 +532,14 @@
         label-position="right"
       >
         <el-form-item label="批次号">
-          <el-input v-model="batchForm.batchNo"></el-input>
+          <el-input v-model="batchForm.batchNo" style="width: 220px"></el-input>
         </el-form-item>
         <el-form-item label="拆批数">
-          <el-input v-model="batchForm.quantity"></el-input>
+          <el-input
+            v-model="batchForm.quantity"
+            style="width: 220px"
+          ></el-input>
+          {{ batchForm.unit }}
         </el-form-item>
         <el-form-item label="是否合格">
           <el-select
@@ -1126,7 +1130,8 @@
           batchNo: '',
           isQualified: 1,
           notType: '',
-          notReason: ''
+          notReason: '',
+          unit: ''
         },
         itemData: {},
         itemIndex: '',
@@ -1291,7 +1296,9 @@
       },
 
       openBatch(item, index) {
+        console.log(item, '需要拆批的数据');
         this.batchForm.quantity = '';
+        this.batchForm.unit = '';
         this.batchForm.batchNo = '';
         this.batchForm.isQualified = 1;
         this.batchForm.notType = '';
@@ -1299,6 +1306,7 @@
         this.itemData = item;
         this.itemIndex = index;
         this.batchForm.batchNo = item.batchNo;
+        this.batchForm.unit = item.unit;
         this.batchVisible = true;
       },
 

src/views/produce/components/workPlan/components/inspectionTemplateDialog.vue

@@ -12,11 +12,12 @@
       ref="table"
       :columns="columns"
       :datasource="datasource"
-      height="calc(100vh - 605px)"
+      :height="tableHeight"
       tool-class="ele-toolbar-form"
       row-key="qualityLevelId"
       v-if="equipmentdialog"
       :selection.sync="selection"
+      @fullscreen-change="fullscreenChange"
     >
       <template v-slot:status="{ row }">
         {{ row.status ? '启用' : '停用' }}
@@ -93,7 +94,8 @@
             slot: 'action',
             fixed: 'right'
           }
-        ]
+        ],
+        tableHeight: 'calc(100vh - 605px)'
       };
     },
 
@@ -114,6 +116,14 @@
       handleClose() {
         this.equipmentdialog = false;
       },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 605px)';
+        }
+      },
       // 选择
       selected() {
         if (!this.selection.length) {

src/views/produce/components/workPlan/components/search.vue

@@ -1,45 +1,48 @@
 <!-- 搜索表单 -->
-
 <template>
   <el-form
-    label-width="77px"
+    label-width="100px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+        <el-form-item label="质检方案名称:">
+          <el-input
+            clearable
+            v-model="where.qualitySchemeTemplateName"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
-        <el-form-item label="工序:">
+        <el-form-item label="质检方案编码:">
           <el-input
             clearable
-            v-model="where.produceTaskName"
+            v-model="where.qualitySchemeTemplateCode"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
-      <!--
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6}">
-        <el-form-item label="状态:" >
-          <el-select v-model="where.status" class="m-2" placeholder="请选择" size="large" style="width: 100%">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
+        <el-form-item label="状态:">
+          <el-select
+            v-model="where.status"
+            class="m-2"
+            placeholder="请选择"
+            size="large"
+            style="width: 100%"
+          >
             <el-option label="停用" :value="0" />
             <el-option label="启用" :value="1" />
           </el-select>
         </el-form-item>
-      </el-col> -->
-      <!-- <el-col v-bind="styleResponsive ?{ lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="组织机构:">
-          <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
-        </el-form-item>
-      </el-col> -->
+      </el-col>
       <el-col
         style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 12, md: 6 } : { span: 12 }"
+        v-bind="styleResponsive ? { lg: 6, md: 18 } : { span: 6 }"
       >
         <div class="ele-form-actions">
           <el-button
@@ -62,9 +65,9 @@
     data() {
       // 默认表单数据
       const defaultWhere = {
-        code: '',
-        produceTaskName: '',
-        deptIds: ''
+        name: '',
+        standardCode: '',
+        status: ''
       };
       return {
         defaultWhere,

vue.config.js

@@ -35,13 +35,13 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        // 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.144:18086',
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.33:18086',
-        target: 'http://192.168.1.251:18186',
+        // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域