修改 报工信息

src/views/InTheSystem/components/tgDetails.vue

@@ -87,11 +87,7 @@
             align: 'center'
           },
 
-          {
-            prop: 'taskStayTimeDuration',
-            label: '停留时间(分钟)',
-            align: 'center'
-          },
+         
     
           {
             prop: 'categoryCode',
@@ -139,7 +135,11 @@
             label: '数量',
             align: 'center'
           },
-
+          {
+            prop: 'taskStayTimeDuration',
+            label: '停留时间(分钟)',
+            align: 'center'
+          },
           {
             prop: 'weight',
             slot: 'weight',
@@ -154,7 +154,7 @@
             label: '设备名称',
             align: 'center'
           },
-
+        
           {
             prop: 'workstationName',
             label: '工位',

src/views/InTheSystem/index.vue

@@ -77,11 +77,7 @@
             label: '处置工序',
             align: 'center'
           },
-          {
-            prop: 'taskStayTimeDuration',
-            label: '停留时间(分钟)',
-            align: 'center'
-          },
+         
           {
             prop: 'categoryCode',
             label: '物品编码',
@@ -112,7 +108,11 @@
             label: '设备名称',
             align: 'center'
           },
-
+          {
+            prop: 'taskStayTimeDuration',
+            label: '停留时间(分钟)',
+            align: 'center'
+          },
           {
             prop: 'workstationName',
             label: '工位',

src/views/outsourcing/components/details.vue

@@ -1,7 +1,56 @@
 <template>
     <el-dialog title="详情" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
         :close-on-press-escape="false" append-to-body width="80%">
+
+        <el-form ref="form"  label-width="100px" class="create-form"
+            >
+            <headerTitle title="基本信息" style="margin-top: 15px"></headerTitle>
+
+            <el-row :gutter="15">
+               
+            
+                <el-col :span="8">
+                    <el-form-item label="委外单编码:" prop="code">
+                        <el-input v-model="row.code" disabled />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="委外单名称:" prop="name">
+                        <el-input v-model="row.name" disabled />
+                    </el-form-item>
+                </el-col>
+     
+                <el-col :span="8">
+                    <el-form-item label="工单编码:" prop="factoriesName">
+                        <el-input v-model="row.workOrderCode" style="width: 100%" disabled>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="预计到货日期:" prop="factoriesName">
+                        <el-input v-model="row.requireDeliveryTime" style="width: 100%" disabled>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="创建时间:" prop="factoriesName">
+                        <el-input v-model="row.createTime" style="width: 100%" disabled>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="工序:" prop="status">
+                        <el-tag>{{ row.status == 1 ? '已发布' : '未发布' }}</el-tag>
+                    </el-form-item>
+                </el-col>
+                
+
+            </el-row>
        
+        </el-form>
+
+
+
         <!-- 数据表格 -->
         <ele-pro-table ref="table" v-if="detailType == 1" :columns="columns" cache-key="detailsTable"
             height="calc(100vh - 350px)">
@@ -9,12 +58,12 @@
                 {{ row.totalCount }}{{ row.measuringUnit }}
             </template>
 
-    
+
 
             <template v-slot:sourceType="{ row }">
-                 <el-tag v-if="row.sourceType == 1" size="mini" type="success">物品清单</el-tag>
-                 <el-tag v-if="row.sourceType == 2" size="mini" type="warning">带料清单</el-tag>
-                 <el-tag v-if="row.sourceType == 3" size="mini" type="danger">产出清单</el-tag>
+                <el-tag v-if="row.sourceType == 1" size="mini" type="success">物品清单</el-tag>
+                <el-tag v-if="row.sourceType == 2" size="mini" type="warning">带料清单</el-tag>
+                <el-tag v-if="row.sourceType == 3" size="mini" type="danger">产出清单</el-tag>
             </template>
 
 
@@ -30,8 +79,8 @@
 
             <template v-slot:sourceType="{ row }">
                 <el-tag v-if="row.sourceType == 1" size="mini" type="success">物品清单</el-tag>
-                 <el-tag v-if="row.sourceType == 2" size="mini" type="warning">带料清单</el-tag>
-                 <el-tag v-if="row.sourceType == 3" size="mini" type="danger">产出清单</el-tag>
+                <el-tag v-if="row.sourceType == 2" size="mini" type="warning">带料清单</el-tag>
+                <el-tag v-if="row.sourceType == 3" size="mini" type="danger">产出清单</el-tag>
             </template>
 
         </ele-pro-table>
@@ -40,7 +89,7 @@
 
     </el-dialog>
 </template>
-  
+
 <script>
 
 
@@ -51,7 +100,7 @@ export default {
         return {
             visible: false,
             detailType: null,
-
+            row:{}
         }
     },
 
@@ -147,7 +196,7 @@ export default {
                     align: 'center'
                 },
 
-                
+
                 {
                     prop: 'sourceType',
                     slot: 'sourceType',
@@ -236,7 +285,7 @@ export default {
                 })
             }
 
-
+            this.row = row;
 
         },
 
@@ -256,6 +305,5 @@ export default {
     }
 }
 </script>
-  
-<style lang="scss" scoped></style>
-  
+
+<style lang="scss" scoped></style>

src/views/outsourcing/index.vue

@@ -10,6 +10,14 @@
         :datasource="datasource"
         cache-key="workOrderTable"
       >
+      <template v-slot:code="{ row }">
+          <el-link
+              type="primary"
+              :underline="false"
+              @click="handleDetails(row)"
+              >{{ row.code }}</el-link
+            >
+        </template>
         <template v-slot:requireDeliveryTime="{ row }">
           <span v-if="row.deliveryMethod == 1">{{
             row.requireDeliveryTime
@@ -65,13 +73,13 @@
         </template>
 
         <template v-slot:action="{ row }">
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             @click="handleDetails(row)"
           >
             详情
-          </el-link>
+          </el-link> -->
 
           <el-link
             type="primary"
@@ -144,6 +152,7 @@
             minWidth: 100
           },
           {
+            slot: 'code',
             prop: 'code',
             label: '委外单编码',
             align: 'center'
@@ -155,6 +164,7 @@
           },
 
           {
+           
             prop: 'workOrderCode',
             label: '工单编码',
             align: 'center'

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

@@ -1,4 +1,6 @@
 <template>
+
+  <!-- 报工详情 -->
   <div>
     <div class="" v-if="taskType != 5">
       <div v-for="(objData, index) in list" :key="index" class="card_box">
@@ -248,7 +250,10 @@
           return {};
         }
       },
-
+      newId:{
+        type:String,
+        default:''
+      },
       curTaskObj: {
         type: Object,
         default() {
@@ -262,11 +267,18 @@
         handler(obj) {
           if (obj) {
             this.taskType = obj.type;
-            this.getList(obj.taskId);
+            this.getList();
           }
         },
         deep: true,
         immediate: true
+      },
+      newId:{
+        handler(newval) {
+            this.newIdTo = newval;
+        },
+        deep: true,
+        immediate: true
       }
     },
 
@@ -280,6 +292,7 @@
       return {
         taskType: null,
         list: [],
+        newIdTo:'',
         taskType: 1
       };
     },
@@ -287,10 +300,10 @@
     created() {},
 
     methods: {
-      getList(taskId) {
+      getList() {
         let param = {
           workOrderId: this.routeObj.id,
-          taskId: taskId
+          taskId: this.newId
         };
         console.log(this.taskType);
         let URL = this.taskType == 5 ? listApplystorage : listWorkReport;

src/views/produce/components/produceOrder.vue

@@ -48,6 +48,7 @@
       </template>
     </ele-pro-table>
 
+    <!-- //工单列表 -->
     <routings
       v-if="routingShow"
       :routeObj="routeObj"

src/views/produce/components/routings.vue

@@ -33,6 +33,7 @@
           </el-tab-pane>
           <el-tab-pane label="报工详情">
             <jobDetails
+              :newId="newId"
               :routeObj="routeObj"
               :curTaskObj="curTaskObj"
             ></jobDetails>
@@ -65,10 +66,10 @@
         routeList: [],
         activeIndex: 0,
         desIndex: 0,
+        newId:-1,
         curTaskObj: null
       };
     },
-
     methods: {
       getTaskFn() {
         getTaskInstanceList(this.routeObj.id).then((res) => {
@@ -87,6 +88,7 @@
             this.curTaskObj  =  JSON.parse(JSON.stringify( this.routeList[0])); 
             this.desIndex = 0;
           }
+
           this.activeIndex = index;
         });
       },
@@ -97,11 +99,13 @@
       },
 
       handIdx(index, item) {
+        console.log(index, item);
         this.curTaskObj = JSON.parse(JSON.stringify(item));
         if (item.taskId == -2) {
           this.$message.info('完结状态不能点击');
         } else {
           this.desIndex = index;
+          this.newId = this.curTaskObj.taskId;
         }
       }
     },

src/views/produce/index.vue

@@ -3,13 +3,16 @@
     <div class="content_box">
 
       <Search></Search>
+
+
+
       <ele-split-layout space="0px" width="45%" :resizable="true" :min-size="200" :max-size="-200" :left-style="{
         overflow: 'hidden',
         width: '100%'
       }" :right-style="{ overflow: 'hidden' }" :responsive="false" style="height: calc(100vh - 70px - 50px - 80px)">
         <div class="left_main">
           <div class="top">
-
+            <!-- /工单列表 -->
             <produceOrder @workSelect="workSelect" @rowClick="rowClick"></produceOrder>
 
           </div>

src/views/produceOrder/components/details/index.vue

@@ -27,6 +27,7 @@
       </div>
 
       <div class="drawer_content">
+        <!-- //详细信息 -->
         <Info :workOrderInfo="workOrderInfo"></Info>
 
         <el-steps
@@ -41,6 +42,7 @@
             :title="item.taskTypeName"
             @click.native="handIdx(index, item)"
             :description="desIndex == index ? '此处' : ''"
+            :class="desIndex == index?'active':''"
           ></el-step>
         </el-steps>
 
@@ -51,10 +53,12 @@
               :curTaskObj="curTaskObj"
             ></feedDetails
           ></el-tab-pane>
+
           <el-tab-pane label="报工详情">
             <jobDetails
               :routeObj="routeObj"
               :curTaskObj="curTaskObj"
+              :newId = "newId"
             ></jobDetails>
           </el-tab-pane>
 
@@ -91,7 +95,7 @@
         activeIndex: 0,
         desIndex: 0,
         curTaskObj: null,
-
+        newId:'',
         routeObj: {
           id: null
         }
@@ -125,7 +129,10 @@
             (item) => Number(item.taskId) == Number(this.workOrderInfo.taskId)
           );
 
+          
           this.desIndex = index;
+          console.log(this.routeList,'888888');
+          this.newId = this.routeList[this.desIndex].taskId||'';
 
           if (this.workOrderInfo.taskId != -2) {
             this.curTaskObj = JSON.parse(JSON.stringify(this.routeObj));
@@ -139,10 +146,12 @@
 
       handIdx(index, item) {
         this.curTaskObj = JSON.parse(JSON.stringify(item));
+
         if (item.taskId == -2) {
           this.$message.info('完结状态不能点击');
         } else {
           this.desIndex = index;
+          this.newId = this.routeList[this.desIndex].taskId||'';
         }
       }
     }
@@ -180,4 +189,9 @@
     margin: 10px 20px;
     box-sizing: border-box;
   }
+  ::v-deep .active .is-text {
+    background: #FFA929; /* 背景色 */
+    border-color: #FFA929;
+    color: #ffffff; /* 图标文字颜色 */
+  }
 </style>

src/views/produceOrder/index.vue

@@ -622,6 +622,7 @@
         });
       },
 
+      // 生产工单跳转
       goDetail(row) {
         this.$refs.detailsRef.open(row)
       },

src/views/warehousing/components/tgDetails.vue

@@ -1,5 +1,49 @@
 <template>
   <ele-modal :visible.sync="visible" title="入库详情" width="1200px" :maxable="true">
+    <el-form ref="form"  label-width="100px" class="create-form"
+            >
+            <headerTitle title="基本信息" style="margin-top: 15px"></headerTitle>
+
+            <el-row :gutter="15">
+               
+            
+                <el-col :span="8">
+                    <el-form-item label="编码:" prop="code">
+                        <el-input v-model="row.code" disabled />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="工单编码:" prop="workOrderCode">
+                        <el-input v-model="row.workOrderCode" disabled />
+                    </el-form-item>
+                </el-col>
+     
+                <el-col :span="8">
+                    <el-form-item label="仓库名称:" prop="warehouseName">
+                        <el-input v-model="row.warehouseName" style="width: 100%" disabled>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="物品分类:" prop="categoryLevelName">
+                        <el-input v-model="row.categoryLevelName" style="width: 100%" disabled>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="创建时间:" prop="createTime">
+                        <el-input v-model="row.createTime" style="width: 100%" disabled>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+
+                
+
+            </el-row>
+       
+        </el-form>
+
+
     <ele-pro-table v-if="clientEnvironmentId == 3" :columns="columns" :datasource="tableList" cache-key="tgDetails" height="calc(100vh - 350px)"
       :need-page="false">
 
@@ -31,7 +75,7 @@
     </ele-pro-table>
 
 
-    <ele-pro-table v-if="clientEnvironmentId == 2" :columns="columns2" :datasource="tableList" cache-key="srDetails" height="calc(100vh - 350px)"
+    <ele-pro-table v-else-if="clientEnvironmentId == 2" :columns="columns2" :datasource="tableList" cache-key="srDetails" height="calc(100vh - 350px)"
       :need-page="false">
 
       <template v-slot:quantity="{ row }">
@@ -41,7 +85,7 @@
 
     </ele-pro-table>
 
-    <ele-pro-table v-if="clientEnvironmentId == 4" :columns="columns" :datasource="tableList" cache-key="tgDetails" height="calc(100vh - 350px)"
+    <ele-pro-table v-else-if="clientEnvironmentId == 4" :columns="columns" :datasource="tableList" cache-key="tgDetails" height="calc(100vh - 350px)"
       :need-page="false">
 
 
@@ -71,6 +115,35 @@
 
     </ele-pro-table>
 
+    <ele-pro-table v-else :columns="columns" :datasource="tableList" cache-key="srDetails" height="calc(100vh - 350px)"
+      :need-page="false">
+
+
+      
+
+      <template v-slot:packingWeight="{ row }">
+        {{ row.packingWeight }} {{  row.weightUnit}}
+      </template>
+
+
+
+      <template v-slot:materielCode="{ row }">
+        {{ row.extInfo.materielCode }}
+      </template>
+
+
+      <template v-slot:clientCode="{ row }">
+        {{ row.extInfo.clientCode }}
+      </template>
+
+
+      <template v-slot:engrave="{ row }">
+        {{ row.extInfo.engrave }}
+      </template>
+
+
+
+    </ele-pro-table>
   </ele-modal>
 </template>
 
@@ -88,6 +161,7 @@ export default {
     return {
       visible: false,
       tableList: [],
+      row:{},
       columns: [
         {
           label: '序号',
@@ -96,10 +170,10 @@ export default {
           align: 'center'
         },
 
-        {
-          label: '入库申请单id',
-          prop: 'applyStorageId'
-        },
+        // {
+        //   label: '入库申请单id',
+        //   prop: 'applyStorageId'
+        // },
 
 
 
@@ -245,7 +319,10 @@ export default {
   },
   methods: {
     open(row) {
+      console.log(row,'row++++++++++');
+      
       if (row) {
+        this.row = row;
         this.tableList = [...row.detailList]
       }
       this.visible = true;

src/views/warehousing/index.vue

@@ -4,7 +4,7 @@
       <search @search="reload" ref="searchRef"> </search>
 
       <!-- 数据表格 -->
-      <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
+      <ele-pro-table ref="table" :columns="columns" :datasource="datasource" >
         <template v-slot:totalCount="{ row }">
           {{ row.totalCount }} {{ row.measuringUnit }}
         </template>