增加雇员数量

src/views/mes/pro/productionSolution/components/ProogingBom.vue

@@ -62,6 +62,7 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="雇员数量" align="center" prop="employeesNum" />
       <el-table-column label="标准用量" align="center" prop="quantity" />
       <el-table-column label="基本用量" align="center" prop="basicQuantity" />
       <el-table-column label="BOM行备注" align="center" prop="bomItemRemark" />

src/views/mes/pro/scheduleList/workunitSelectSche.vue

@@ -17,6 +17,7 @@
         <el-form-item label="工作单元编码" prop="workunitCode">
           <el-input
             v-model="queryParams.workunitCode"
+            disabled
             placeholder="请输入工单编码"
             clearable
             @keyup.enter.native="handleQuery"
@@ -25,13 +26,14 @@
         <el-form-item label="工作单元名称" prop="workunitName">
           <el-input
             v-model="queryParams.workunitName"
+            disabled
             placeholder="请输入工作单元名称"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item label="工作中心" prop="workstationId">
-        <el-select filterable v-model="queryParams.workstationId" placeholder="请选择工作中心" clearable @change="getList">
+        <el-select filterable v-model="queryParams.workstationId" disabled placeholder="请选择工作中心" clearable @change="getList">
             <el-option
             v-for="dict in workstationList"
             :key="dict.workstationId"

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

@@ -89,8 +89,8 @@
         <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
-      <el-form-item label="排版状态" prop="dtaAction">
-        <el-select v-model="queryParams.dtaAction" placeholder="请选择排版状态" clearable>
+      <el-form-item label="排版状态" prop="dtaActions">
+        <el-select v-model="queryParams.dtaActions" placeholder="请选择排版状态" clearable multiple>
           <el-option v-for="dict in dict.type.dta_action" :key="dict.value" :label="dict.label"
             :value="dict.value"></el-option>
         </el-select>
@@ -822,7 +822,7 @@ export default {
         pageSize: 50,
         workorderCodes: null,
         arrangeCodes: null,
-        dtaAction: null,
+        dtaActions: [],
         complate: null,
         workorderName: null,
         orderSource: null,
@@ -1615,6 +1615,7 @@ export default {
         params.workorderCodes = this.selectedRows.map(item => item.workorderCode)
       }
       params.statusArr = params.statusArr.length > 0 ? params.statusArr : null;
+      params.dtaActions = params.dtaActions.length > 0 ? params.dtaActions : null;
       delete params.pageNum;
       delete params.pageSize;
       this.download1(

src/views/mes/proTable/productProcess/index.vue

@@ -86,10 +86,9 @@
         <el-table-column :label="'标准工时'" align="center" prop="stdWorkingTime"></el-table-column>
         <el-table-column :label="'实际工时'" align="center" prop="machineTime">
           <template slot-scope="scope">
-            {{scope.row['machineTime'] ? Number(scope.row['machineTime']).toFixed(2) : scope.row['machineTime']}}
+            {{scope.row['machineTime'] ? Number(scope.row['machineTime']).toFixed(3) : scope.row['machineTime']}}
           </template>
         </el-table-column>
-        <el-table-column :label="'报工时间'" align="center" prop="feedbackTime"></el-table-column>
       </el-table>
     </div>
     

src/views/mes/proTable/supplementaryOrder/index.vue

@@ -59,7 +59,7 @@
             <el-table-column :label="item.label" align="center" :prop="item.value" :width="item.width" v-for="(item, index) in theaders" :key="index">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType"  v-if="item.value==='workorderType'" />
-                <div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(2) : scope.row[item.value] : scope.row[item.value] }}</div>
+                <div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(3) : scope.row[item.value] : scope.row[item.value] }}</div>
               </template>
             </el-table-column>
           </el-table>
@@ -82,7 +82,7 @@
             <el-table-column :label="item.label" align="center" :prop="item.value" v-for="(item, index) in theaders" :key="index">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType"  v-if="item.value==='workorderType'" />
-                <div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(2) : scope.row[item.value] : scope.row[item.value] }}</div>
+                <div v-else>{{ item.value === 'machineTime' ? scope.row[item.value] ? Number(scope.row[item.value]).toFixed(3) : scope.row[item.value] : scope.row[item.value] }}</div>
               </template>
             </el-table-column>
           </el-table>

src/views/system/user/profile/workunitSelect.vue

@@ -105,6 +105,8 @@ export default {
         this.selectedRows = []
         this.queryParams.workstationName = this.workstationName;
         this.queryParams.workstationId = this.workstationId;
+        this.queryParams.workunitName = ''
+        this.queryParams.workunitCode = ''
         this.getList();
       },
       immediate: true