附件1

src/views/mes/pro/machineryJob/index.vue

@@ -142,6 +142,7 @@
         <template slot-scope="scope">
           <el-tag type="danger" v-if="scope.row.jobStatus === 'WORKING'">进行中</el-tag>
           <el-tag type="success" v-if="scope.row.jobStatus === 'FINISHED'">已完成</el-tag>
+          <el-tag type="warning" v-if="scope.row.jobStatus === 'CANCEL'">已撤销</el-tag>
         </template>
       </el-table-column>
       <el-table-column
@@ -448,7 +449,6 @@ export default {
 
         startTime: this.dateRange[0],
         endTime: this.dateRange[1],
-        
       }).then((response) => {
         this.tableList = response.rows;
         this.total = response.total;

src/views/mes/pro/process/index.vue

@@ -32,7 +32,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="需求日期" prop="requestDate">
+      <!-- <el-form-item label="需求日期" prop="requestDate">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px"
@@ -42,7 +42,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
         ></el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
           >搜索</el-button

src/views/mes/pro/workorder/index.vue

@@ -217,7 +217,7 @@
         width="100px"
         prop="quantityProduced"
       />-->
-      <el-table-column label="批次号" align="center" width="100px" prop="batchCode" />
+      <!-- <el-table-column label="批次号" align="center" width="100px" prop="batchCode" /> -->
       <el-table-column label="客户编码" align="center" prop="clientCode" />
       <el-table-column
         label="客户名称"
@@ -294,8 +294,12 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="工单编号" prop="workorderCode" >
+            <el-form-item label="工单编号" prop="workorderCode">
-              <el-input v-model="form.workorderCode" placeholder="请输入工单编号" :disabled="form.status == 'CONFIRMED'" />
+              <el-input
+                v-model="form.workorderCode"
+                placeholder="请输入工单编号"
+                :disabled="form.status == 'CONFIRMED'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -358,7 +362,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="单据状态" prop="status">
-              <el-select v-model="form.status" :disabled="form.status !== 'CONFIRMED'" placeholder="请选择单据状态">
+              <el-select
+                v-model="form.status"
+                :disabled="form.status !== 'CONFIRMED'"
+                placeholder="请选择单据状态"
+              >
                 <el-option
                   v-for="dict in dict.type.mes_order_status"
                   :key="dict.value"
@@ -465,7 +473,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="班组" prop="teamName">
-              <el-input v-model="form.teamName" :disabled="form.status !== 'CONFIRMED'" placeholder="请选择班组">
+              <el-input
+                v-model="form.teamName"
+                :disabled="form.status !== 'CONFIRMED'"
+                placeholder="请选择班组"
+              >
                 <el-button
                   slot="append"
                   @click="handleSelectTeam"
@@ -561,7 +573,9 @@
         <el-button
           type="primary"
           @click="submitForm"
-          v-if="form.status == 'PREPARE' || title == '修改生产工单'  && optType != 'view'"
+          v-if="
+            form.status == 'PREPARE' || (title == '修改生产工单' && optType != 'view')
+          "
           >保 存</el-button
         >
         <el-button
@@ -588,10 +602,7 @@
         @cancels="cancels"
       />
     </el-dialog>
-    <selectSaleOrder
+    <selectSaleOrder ref="selectSaleOrders" @onSelected="handleSelectSaleOrder" />
-      ref="selectSaleOrders"
-      @onSelected="handleSelectSaleOrder"
-    />
   </div>
 </template>
 

src/views/mes/wm/itemrecpt/index.vue

@@ -145,6 +145,12 @@
         align="center"
         prop="itemName"
         :show-overflow-tooltip="true"
+      />
+        <el-table-column
+        label="产品物料编码"
+        align="center"
+        prop="itemCode"
+        :show-overflow-tooltip="true"
       />
        <el-table-column
         label="规格型号"

src/views/mes/wm/productsalse/index.vue

@@ -146,6 +146,8 @@
           <span>{{ scope.row.sumQuantity ? scope.row.sumQuantity + "KG" : "—" }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="发货日期" align="center" prop="sendDate" />
+      <el-table-column label="发货车号" align="center" prop="sendCarCode" />
       <el-table-column label="出库日期" align="center" prop="salseDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.salseDate, "{y}-{m}-{d}") }}</span>