报工信息

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

@@ -67,6 +67,18 @@
           <el-input v-else size="mini" class="content_num" v-model="row.extInfo.materielCode" placeholder="物料代号" />
         </template>
       </el-table-column>
+      <el-table-column label="客户代号" prop="clientCode"  v-if="item.singleReport == 1">
+        <template slot-scope="{ row, $index }">
+          <span v-if="isDetails"> {{ row.extInfo.clientCode }}</span>
+          <el-input
+            v-else
+            size="mini"
+            class="content_num"
+            v-model="row.extInfo.clientCode"
+            placeholder="请输入客户代号"
+          />
+        </template>
+      </el-table-column>
 
 
       <el-table-column v-if="singleReport == 1 && deviceList.length > 0" width="140" label="设备" prop="deviceId">

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

@@ -319,7 +319,7 @@ export default {
               });
             }
 
-            if (this.taskObj.type == 6 && this.clientEnvironmentId == 3) {
+            if (this.taskObj.type == 6) {
               obj.semiProductList = obj.pickOutInList;
               obj.pickOutInList=[]
             }

src/views/produce/components/warehousing/index.vue

@@ -15,6 +15,15 @@
 
         <workOrderBom :item="item" v-if="item"></workOrderBom>
 
+        <!-- 报工时间 -->
+        <div>
+          <div class="title_box rx-bc">
+            <div class="name">报工时间</div>
+          </div>
+          <el-date-picker v-model="item.workReportInfo.executorTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择日期">
+          </el-date-picker>
+        </div>
 
         <div v-if="
           clientEnvironmentId == 3 &&
@@ -166,7 +175,8 @@ export default {
               formingWeight: null,
               formedNum: null,
               formedWeight: null,
-              taskId: this.taskObj.id
+              taskId: this.taskObj.id,
+              executorTime: null
             };
 
             return {