模具 #28

src/pages/Middle/Mold/InkjetPrinter/print.vue

@@ -180,16 +180,7 @@ export default {
 
       for (let key in this.searchFormData) {
         let value = this.searchFormData[key];
-        if (key == "inventory") {
+        if (value) {
-          if (value && value[0]) {
-            rules.push({
-              field: " id in (select manufactureOrderID from v_MP_ManufactureOrder_b where inventoryID = " + value[0] + ") ",
-              type: "sql"
-            });
-          }
-
-        } else {
-          if (value) {
             let mode = findMode(key);
             rules.push({
               field: key,
@@ -197,7 +188,6 @@ export default {
               value: value
             });
           }
-        }
 
       }
       if (this.start_time) {

src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue

@@ -5,7 +5,7 @@
     <vxe-table border show-overflow keep-source ref="xTable" :data="detailsData" @pulldownSelected="onPulldownSelected"
       @popupSelected="onPopupSelected" :export-config="{}" @edit-closed="afterEditEvent" @edit-actived="beforeEditEvent"
       :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
-      
+
       <vxe-column field="component_num" title="部件数量" width="160"
         :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
       <vxe-column field="production_type" title="布产类型" width="160" :edit-render="{}">
@@ -32,9 +32,10 @@
 
       <vxe-column title="完成" width="160" v-if="getDataId()">
         <template #default="{ row }">
-          <div v-if="row.id"> 
+          <div v-if="row.id">
             <div v-if="row.complete_time">{{ $mk.getDateString(row.complete_time) }}</div>
-            <a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)" type="primary">完成</a-button>
+            <a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)"
+              type="primary">完成</a-button>
           </div>
         </template>
       </vxe-column>
@@ -44,10 +45,10 @@
       <vxe-column field="complete_type" v-if="getDataId() && isDetails1Complete()" title="完工人员类型" width="160"
         :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
 
-        
+
-      <vxe-column field="spec" title="规格" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column> 
+      <vxe-column field="spec" title="规格" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
-      <vxe-column field="surface" title="表面工艺" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>  
+      <vxe-column field="surface" title="表面工艺" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
-      <vxe-column field="inlay" title="镶件材料" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column> 
+      <vxe-column field="inlay" title="镶件材料" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
       <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
@@ -73,9 +74,9 @@
         :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
       <vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef"
         :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
-      <vxe-column field="progress" title="进度" width="160" :cellRender="{name: 'progress'}"  ></vxe-column>
+      <vxe-column field="progress" title="进度" width="160" :cellRender="{ name: 'progress' }"></vxe-column>
+
 
- 
 
 
       <vxe-column v-if="false" field="process_uid_detail" title="加工人员" width="160" :params="editor_process_uid"
@@ -91,7 +92,7 @@
 
       <vxe-column title="发料" width="210" v-if="getDataId()">
         <template #default="{ row }">
-          <div  v-if="row.id">
+          <div v-if="row.id">
             <a-button v-if="!row.is_send" @click.stop="pageSend(row)" type="primary">发料</a-button>
             <div v-if="row.is_send">
 
@@ -114,8 +115,8 @@
         </template>
       </vxe-column>
 
-      <vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员类型" width="160" :params="{ data: options_user_type }"
+      <vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员类型" width="160"
-        formatter='formatEnum'></vxe-column>
+        :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
 
 
       <vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员类型" width="160"
@@ -377,7 +378,7 @@ export default {
         if (this.detailsData[i].is_complete) {
           return true;
         }
-      } 
+      }
       return false;
     },
 
@@ -497,7 +498,7 @@ export default {
     pageAdd(row) {
       const $table = this.$refs.xTable
       const record = {
-        
+
       }
       if (row) {
         this.detailsData = JSON.parse(JSON.stringify(this.detailsData))
@@ -524,8 +525,8 @@ export default {
     pageAdd2(row) {
       const $table = this.$refs.xTable2
       const record = {
-        component_line:this.detailsData[0].component_line,
+        component_line: this.detailsData[0].component_line,
-        component_id:this.detailsData[0].component_id
+        component_id: this.detailsData[0].component_id
       }
       if (row) {
         this.detailsData2 = JSON.parse(JSON.stringify(this.detailsData2))
@@ -550,7 +551,12 @@ export default {
     },
 
     postDataUpdate() {
-      let postdata = {};
+      let postdata = {}; 
+
+      this.detailsData2.forEach(item => { 
+        item.component_line = this.detailsData[0].component_line;
+      })
+
       postdata.mold_production_order_component = this.$mk.getPostFieldValue({
         rowFilter: (row) => { return row.id || row.component_id },
         dataId: this.getDataId_BigInt(),
@@ -585,8 +591,8 @@ export default {
         } : [];
       } else {
 
-        let list = [ ...this.detailsData2];
+        let list = [...this.detailsData2];
-        list.forEach(item=>{ 
+        list.forEach(item => {
           item.component_id = this.detailsData[0].component_id;
         })
         postdata.mold_production_order_component_processes = this.$mk.getPostFieldValue({
@@ -601,7 +607,7 @@ export default {
             { field: 'prepare_process_time', type: 'timestamp' },
             { field: 'plan_complete_time', type: 'timestamp' },
 
-            
+
             { field: 'order_id', type: 'bigint' },
             { field: 'send_uid', type: 'bigint' },
             { field: 'complete_uid', type: 'bigint' },
@@ -700,4 +706,5 @@ export default {
 
 .oplinks2 i {
   margin-left: 5px;
-}</style>
+}
+</style>