代码更新

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -124,14 +124,14 @@
           <el-form-item v-if="false" label="物料标识" prop="material_id">
             <el-input v-model="form.material_id" style="width: 200px;" />
           </el-form-item>
-          <el-form-item label="生产设备">
-            <el-input
-              v-model="form.device_code"
-              style="width: 200px;"
-              clearable
-              @focus="deviceShow=true"
-              @clear="form.device_id='', form.device_code=''"
-            />
+          <el-form-item label="所属工序" prop="workorder_procedure">
+            <el-select v-model="form.workorder_procedure" style="width: 200px" filterable placeholder="请选择" clearable>
+              <el-option
+                v-for="item in dict.workorder_procedure"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="物料编码" prop="material_code">
             <el-input
@@ -197,8 +197,6 @@
               v-model="form.order_status"
               clearable
               filterable
-              size="mini"
-              class="filter-item"
               style="width: 200px"
             >
               <el-option
@@ -208,21 +206,14 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="所属工序">
-            <el-select
-              v-model="form.workorder_procedure"
+          <el-form-item label="生产设备">
+            <el-input
+              v-model="form.device_code"
+              style="width: 200px;"
               clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in dict.workorder_procedure"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+              @focus="deviceShow=true"
+              @clear="form.device_id='', form.device_code=''"
+            />
           </el-form-item>
           <el-form-item label="计划开始时间" prop="planproducestart_date">
             <el-date-picker
@@ -240,6 +231,16 @@
               style="width: 200px;"
             />
           </el-form-item>
+          <el-form-item v-if="form.workorder_procedure == 4" label="所属客户">
+            <el-select v-model="query.cust_id" filterable clearable class="filter-item" style="width: 185px" placeholder="请选择客户" @change="crud.toQuery">
+              <el-option
+                v-for="item in custList"
+                :key="item.cust_id"
+                :label="item.cust_name"
+                :value="item.cust_id"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="是否搬运" prop="is_needmove">
             <el-radio
               v-for="item in dict.is_or_not"

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -132,9 +132,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="point_code1" label="点位1" width="100" />
+        <el-table-column prop="point_code1" label="点位1" width="120" />
         <el-table-column prop="point1_region_name" label="区域1" width="120" />
-        <el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="point_code2" label="点位2" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
         <!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
         <el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->