add:新增半成品出入库导入/清洗刻字调度任务

mes/qd/src/views/wms/pcs/deliveryorder/index.vue

@@ -82,25 +82,94 @@
           </el-form-item>
           <rrOperation :crud="crud"/>
         </el-form>
+
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
-          icon="el-icon-position"
+          type="warning"
+          icon="el-icon-upload2"
           size="mini"
-          @click="importin"
+          @click="uploadShow = true"
         >
-          同步
+          导入
         </el-button>
+<!--        <el-button-->
+<!--          slot="right"-->
+<!--          class="filter-item"-->
+<!--          type="success"-->
+<!--          icon="el-icon-position"-->
+<!--          size="mini"-->
+<!--          @click="importin"-->
+<!--        >-->
+<!--          同步-->
+<!--        </el-button>-->
       </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
-                 :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+                 :title="crud.status.title">
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          label-width="160px"
+          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+        >
+          <el-form-item label="发货单号" prop="deliver_code">
+            <el-input v-model="form.deliver_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="销售单单号" prop="deliver_code">
+            <el-input v-model="form.deliver_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="发货单明细" prop="seq_no">
+            <el-input v-model="form.seq_no" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="销售单明细" prop="sale_seq_no">
+            <el-input v-model="form.sale_seq_no" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="发货数量" prop="delivery_qty">
+            <el-input-number v-model="form.delivery_qty" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="计量单位" prop="unit_name">
+            <!-- unit_list-->
+            <el-select v-model="form.qty_unit_id" placeholder="" style="width: 200px">
+              <el-option
+                v-for="item in unit_list"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料编码" prop="material_code">
+            <el-input v-model="form.material_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="客户名称" prop="cust_code">
+            <el-select v-model="form.cust_code" placeholder="" style="width: 200px">
+              <el-option
+                v-for="item in customer_list"
+                :key="item.label"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="计划交期时间" prop="plandeliver_date">
+            <el-date-picker
+              v-model="form.plandeliver_date"
+              value-format="yyyy-MM-dd"
+              type="date"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" style="width: 200px;" />
+          </el-form-item>
         </el-form>
+
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px"></el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
@@ -147,7 +216,11 @@
       <!--分页组件-->
       <pagination/>
     </div>
-    <Dialog :dialog-show.sync="dialogShow"/>
+    <UploadDialog
+      :dialog-show.sync="uploadShow"
+      @tableChanged3="tableChanged3"
+    />
+    <Dialog :dialog-show.sync="dialogShow" />
   </div>
 </template>
 
@@ -194,7 +267,7 @@ export default {
     return CRUD({
       title: '发货单', url: 'api/deliveryOrder', idField: 'deliver_id', sort: 'deliver_id,desc',
       optShow: {
-        add: false,
+        add: true,
         edit: false,
         del: false,
         reset: true,
@@ -206,9 +279,11 @@ export default {
   data() {
     return {
       classes3: [],
+      uploadShow: false,
       dialogShow: false,
       permission: {},
       rules: {},
+      unit_list: [{ value: 16, label: '个\\只' }],
       queryTypeOptions: [
         {key: 'deliver_code', display_name: '发货单号'}
       ]
@@ -231,6 +306,9 @@ export default {
         })
       })
     },
+    tableChanged3() {
+      this.crud.toQuery()
+    },
     importin() {
       this.dialogShow = true
     },

mes/qd/src/views/wms/pcs/saleorder/index.vue

@@ -152,14 +152,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="计划交期时间" prop="plandeliver_date">
-            <el-date-picker
-              v-model="form.plandeliver_date"
-              value-format="yyyy-MM-dd"
-              type="date"
-              style="width: 200px;"
-            />
-          </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" style="width: 200px;" />
           </el-form-item>