55

src/views/pick/pickApply/components/selfBuildPick.vue

@@ -203,7 +203,6 @@
       },
 
       save() {
-
         if (this.objPick.pickList.length == 0) {
           this.$message.warning('请选择物料');
           return false;
@@ -234,8 +233,8 @@
 
         let param = {
           detailList: this.objPick.pickList,
-          pickName: this.pickForm.pickName,
-          pickCode: this.pickForm.pickCode
+          name: this.pickForm.pickName,
+          code: this.pickForm.pickCode
         };
 
         unproductive(param).then((res) => {

src/views/pick/pickApply/index.vue

@@ -24,7 +24,9 @@
         </template>
         <template v-slot:status="{ row }">
           <el-tag
-            :type="row.status == '0' ? 'danger' : 'success'"
+            :type="
+              row.status == '0' ? 'danger' : row.status == '1' ? '' : 'success'
+            "
             effect="dark"
             >{{
               row.status == '0'
@@ -37,11 +39,23 @@
             }}</el-tag
           >
         </template>
+
+        <template v-slot:action="{ row }">
+          <el-button type="text" size="mini" @click="handDetailed(row)"
+            >详情</el-button
+          >
+        </template>
       </ele-pro-table>
     </el-card>
 
     <addPick v-if="addPickShow" @close="close"></addPick>
     <selfBuildPick v-if="selfBuildPickShow" @close="close"></selfBuildPick>
+
+    <detailed
+      @detailedClose="detailedClose"
+      v-if="detailedShow"
+      :detailedObj="detailedObj"
+    ></detailed>
   </div>
 </template>
 
@@ -53,11 +67,14 @@
   import addPick from './components/addPick.vue';
   import selfBuildPick from './components/selfBuildPick.vue';
 
+  import detailed from '@/views/produce/components/picking/detailed.vue';
+
   export default {
     components: {
       pickSearch,
       addPick,
-      selfBuildPick
+      selfBuildPick,
+      detailed
     },
     data() {
       return {
@@ -66,7 +83,10 @@
         selection: [],
 
         addPickShow: false,
-        selfBuildPickShow: false
+        selfBuildPickShow: false,
+
+        detailedShow: false,
+        detailedObj: null
       };
     },
     computed: {
@@ -177,6 +197,15 @@
         this.selfBuildPickShow = false;
       },
 
+      handDetailed(row) {
+        this.detailedObj = JSON.stringify(row);
+        this.detailedShow = true;
+      },
+
+      detailedClose() {
+        this.detailedShow = false;
+      },
+
       /* 刷新表格 */
       reload(where = {}) {
         this.$refs.table.reload({ page: 1, where });

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

@@ -28,6 +28,7 @@
       </div>
 
       <div v-for="(item, index) in dataObj.orderInfoList" :key="index">
+        
         <ele-pro-table
           ref="table"
           :columns="columns"
@@ -36,6 +37,7 @@
           cache-key="detailed"
           highlight-current-row
           :need-page="false"
+              v-if="item.bomDetailDTOS.length > 0 || item.instanceList.length > 0"
         >
           <template v-slot:toolbar>
             <div class="c_title"> 工单编号: {{ item.code }} </div>

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

@@ -23,7 +23,6 @@
 
       <template v-slot:status="{ row }">
            <el-tag :type="row.status == '0' ?'danger' : 'success'  " effect="dark">{{ row.status == '0' ? '未领料' : row.status == '1' ? '已领料' : row.status == '2' ? '已出库' : ''  }}</el-tag>
-
         </template>
     </ele-pro-table>