rev:提交aps相关代码

mes/qd/.eslintrc.js

@@ -1,3 +1,4 @@
+
 module.exports = {
   root: true,
   parserOptions: {

mes/qd/package.json

@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "build": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",

mes/qd/qodana.yaml

@@ -0,0 +1,29 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-js:latest

mes/qd/src/api/data.js

@@ -6,6 +6,10 @@ export function initData(url, params) {
     params.start_time = params.createTime[0]
     params.end_time = params.createTime[1]
   }
+  if (params.planTime) {
+    params.plan_start_time = params.planTime[0]
+    params.plan_end_time = params.planTime[1]
+  }
   return request({
     url: url + '?' + qs.stringify(params, {indices: false}),
     method: 'get'

mes/qd/src/api/wms/basedata/pdm/workProcedure.js

@@ -32,5 +32,4 @@ export function downSelect(params) {
   })
 }
 
-
 export default { add, edit, del, downSelect }

mes/qd/src/views/mnt/database/execute.vue

@@ -1,12 +1,12 @@
 <template>
-  <el-dialog append-to-body :close-on-click-modal="false" :visible.sync="dialog" title="执行脚本" width="400px">
+  <el-dialog :close-on-click-modal="false" :visible.sync="dialog" append-to-body title="执行脚本" width="400px">
     <el-form ref="form" :rules="rules" size="small">
       <el-upload
         :action="databaseUploadApi"
         :data="databaseInfo"
         :headers="headers"
-        :on-success="handleSuccess"
         :on-error="handleError"
+        :on-success="handleSuccess"
         class="upload-demo"
         drag
       >
@@ -27,6 +27,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
+
 export default {
   props: {
     databaseInfo: {

mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue

@@ -1,25 +1,25 @@
 <!--suppress ALL -->
 <template>
   <el-dialog
+    :before-close="crud.cancelCU"
     :title="crud.status.title"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
     append-to-body
     fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
     width="1200px"
-    @open="open"
     @close="close"
+    @open="open"
   >
     <el-row v-show="crud.status.cu > 0" :gutter="20">
       <el-col :span="20" style="border: 1px solid white">
-        <span />
+        <span/>
       </el-col>
       <el-col :span="4">
         <span>
           <el-button
+            :loading="crud.cu === 2"
             icon="el-icon-check"
             size="mini"
-            :loading="crud.cu === 2"
             type="primary"
             @click="crud.submitCU"
           >保存</el-button>
@@ -30,22 +30,22 @@
 
     <el-form
       ref="form"
-      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
       :inline="true"
       :model="form"
       :rules="rules"
-      size="mini"
-      label-width="85px"
       label-suffix=":"
+      label-width="85px"
+      size="mini"
+      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
     >
       <el-form-item label="车间" prop="workshop_id">
         <label slot="label">车间</label>
         <el-select
           v-model="form.workshop_id"
-          clearable
-          size="mini"
-          placeholder="全部"
           class="filter-item"
+          clearable
+          placeholder="全部"
+          size="mini"
         >
           <el-option
             v-for="item in dict.product_area"
@@ -55,16 +55,26 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="物料编码" prop="material_code">
-        <el-input v-model.trim="form.material_code" disabled class="input-with-select" style="width: 370px;">
-          <el-button slot="append" icon="el-icon-search" @click="insertEvent" />
+      <el-form-item label="原料编码" prop="material_code">
+        <el-input v-model.trim="form.material_code" class="input-with-select" disabled style="width: 210px;">
+          <el-button slot="append" icon="el-icon-search" @click="insertEvent"/>
         </el-input>
       </el-form-item>
-      <el-form-item label="物料名称" prop="material_name">
-        <label slot="label">物料名称:</label>
-        <el-input v-model="form.material_name" size="mini" disabled style="width: 210px" />
+      <el-form-item label="原料名称" prop="material_name">
+        <label slot="label">原料名称:</label>
+        <el-input v-model="form.material_name" disabled size="mini" style="width: 210px"/>
       </el-form-item>
-      <el-form-item label="明细数" prop="detail_count">
+      <el-form-item label="选择对应半成品编码" label-width="150px" prop="semireal_code">
+        <el-select v-model="form.semireal_code" size="mini">
+          <el-option
+            v-for="option in codeOptions"
+            :key="option.relation_id"
+            :label="option.semireal_code"
+            :value="option.semireal_code"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="明细数" prop="detail_count">
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
         <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
       </el-form-item>
@@ -91,94 +101,94 @@
       </el-form-item>
     </el-form>
 
-    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-    <div class="crud-opts2" style="margin-bottom: 5px;">
+    <!-如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <div class="crud-opts2" style="margin-bottom: 5px;">
       <span class="crud-opts-right2">
         <!--左侧插槽-->
-        <slot name="left" />
+        <slot name="left"/>
         <el-button
           v-if="crud.status.add > 0"
           slot="left"
           class="filter-item"
-          type="primary"
           icon="el-icon-plus"
           size="mini"
+          type="primary"
           @click="add"
         >
           新增一行
         </el-button>
       </span>
 
-    </div>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      :data="form.tableData"
-      style="width: 100%;"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <el-table-column type="index" label="序号" width="55" align="center" />
+      </div>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="form.tableData"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" type="index" width="55"/>
 
-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
-      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
-      <el-table-column show-overflow-tooltip prop="ask_time" label="要求到货日期" style="width: 250px">
-        <template slot-scope="scope">
-          <el-date-picker
-            v-model="form.tableData[scope.$index].ask_time"
-            type="date"
-            placeholder="选择日期"
-            align="center"
-            value-format="yyyy-MM-dd"
-            :disabled="crud.status.view > 0"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="qty" label="需求数量">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model.number="form.tableData[scope.$index].qty"
-            size="small"
-            :controls="false"
-            controls-position="right"
-            :precision="3"
-            :min="0"
-            @change="changeQty"
-          />
-        </template>
-      </el-table-column>
-      <!--      <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
-      <!--      <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
-      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="数量单位">
-        <template scope="scope">
-          KG
-        </template>
-      </el-table-column>
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="100" fixed="right">
-        <template scope="scope">
-          <el-button
-            type="danger"
-            class="filter-item"
-            size="mini"
-            icon="el-icon-delete"
-            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column label="物料编码" prop="material_code" show-overflow-tooltip/>
+        <el-table-column label="物料名称" prop="material_name" show-overflow-tooltip/>
+        <el-table-column label="要求到货日期" prop="ask_time" show-overflow-tooltip style="width: 250px">
+          <template slot-scope="scope">
+            <el-date-picker
+              v-model="form.tableData[scope.$index].ask_time"
+              :disabled="crud.status.view > 0"
+              align="center"
+              placeholder="选择日期"
+              type="date"
+              value-format="yyyy-MM-dd"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="需求重量" prop="show_qty" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input-number
+              v-model.number="form.tableData[scope.$index].show_qty"
+              :controls="false"
+              :min="0"
+              :precision="3"
+              controls-position="right"
+              size="small"
+              @change="changeQty"
+            />
+          </template>
+        </el-table-column>
+        <!--      <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
+        <!--      <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
+        <el-table-column label="数量单位" prop="qty_unit_name" show-overflow-tooltip>
+          <template scope="scope">
+            KG
+          </template>
+        </el-table-column>
+        <el-table-column v-if="crud.status.cu > 0" align="center" fixed="right" label="操作" width="100">
+          <template scope="scope">
+            <el-button
+              class="filter-item"
+              icon="el-icon-delete"
+              size="mini"
+              type="danger"
+              @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
 
     <MaterDtl
       :dialog-show.sync="materShow"
       :is-single="true"
       @setMaterValue="tableChanged"
     />
-
   </el-dialog>
 </template>
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import MaterDtl from '@/views/wms/pub/MaterDialog'
+import MaterDtl from '@/views/wms/pub/rawMaterDialog'
 import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'
 
 const defaultForm = {
@@ -187,11 +197,13 @@ const defaultForm = {
   create_mode: '01',
   material_code: '',
   material_name: '',
-  qty_unit_id: '1',
+  semireal_code: '',
+  semi_material_name: '',
+  qty_unit_id: '',
   qty_unit_name: 'KG',
   total_qty: 0,
   detail_count: '0',
-  workshop_id: '',
+  workshop_id: 'A1',
   tableData: []
 }
 
@@ -209,6 +221,7 @@ export default {
       sect_id: '',
       opendtlParam: null,
       sects: [],
+      codeOptions: [],
       rules: {
         product_code: [
           { required: true, message: '生产车间不能为空', trigger: 'blur' }
@@ -247,10 +260,17 @@ export default {
         this.crud.notify('车间不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-
+      if (!this.form.material_code) {
+        this.crud.notify('原料编码不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (!this.form.semireal_code) {
+        this.crud.notify('对应半成品编码不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
       for (let i = 0; i < this.form.tableData.length; i++) {
         const row = this.form.tableData[i]
-        if (!row.qty || row.qty === 0) {
+        if (!row.show_qty || row.show_qty === 0) {
           this.crud.notify('数量不能为0', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
@@ -272,13 +292,23 @@ export default {
       }
     },
     tableChanged(item) {
-      this.form.qty_unit_id = '1'
-      this.form.qty_unit_name = 'KG'
+      this.queryCode(item.material_code)
+      this.form.qty_unit_id = item.base_unit_id
+      this.form.qty_unit_name = item.base_unit_name
       this.form.material_code = item.material_code
       this.form.material_name = item.material_name
       this.form.material_id = item.material_id
       this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(row.plan_qty)
     },
+    async queryCode(materialCode) {
+      try {
+        const response = await crudPurchase.getSemiRealCode(materialCode)
+        this.codeOptions = response
+      } catch (error) {
+        debugger;
+        console.error('Error fetching data:', error)
+      }
+    },
     add() {
       if (!this.form.material_code) {
         this.crud.notify('请选择一种物料进行新增！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -289,12 +319,15 @@ export default {
       row.material_name = this.form.material_name
       row.qty_unit_name = this.form.qty_unit_name
       this.$set(row, 'ask_time', null)
-      this.$set(row, 'qty', null)
+      this.$set(row, 'show_qty', null)
       this.form.tableData.splice(-1, 0, row)
     },
     insertEvent() {
       this.materShow = true
     },
+    insertEvent2() {
+      this.materShow2 = true
+    },
     insertBill(row) {
       this.billShow = true
     },

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

@@ -9,17 +9,17 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="80px"
           label-suffix=":"
+          label-width="80px"
         >
 
           <el-form-item label="车间">
             <el-select
               v-model="query.workshop_id"
-              clearable
-              size="mini"
-              placeholder="全部"
               class="filter-item"
+              clearable
+              placeholder="全部"
+              size="mini"
               @change="crud.toQuery"
             >
               <el-option
@@ -33,44 +33,27 @@
           <el-form-item label="需求日期">
             <el-date-picker
               v-model="query.createTime"
+              :default-time="['00:00:00', '23:59:59']"
+              align="center"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
               type="daterange"
               value-format="yyyy-MM-dd HH:mm:ss"
-              align="center"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="状态">
-            <el-select
-              v-model="query.bill_status"
-              clearable
-              size="mini"
-              placeholder="单据状态"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.IO_BILL_STATUS"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="生成方式">
             <el-select
               v-model="query.create_mode"
+              class="filter-item"
               clearable
               filterable
-              size="mini"
               placeholder="生成方式"
-              class="filter-item"
+              size="mini"
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_CREATE"
+                v-for="item in dict.ST_CREATE_MODE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -80,24 +63,24 @@
           <el-form-item label="物料">
             <el-input
               v-model="query.material_search"
-              size="mini"
               clearable
               placeholder="编码、名称"
+              size="mini"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <rrOperation />
+          <rrOperation/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
           slot="right"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
           :disabled="crud.selections.length === 0"
+          class="filter-item"
+          icon="el-icon-check"
           size="mini"
+          type="warning"
           @click="commit(crud.selections)"
         >
           提交采购
@@ -107,31 +90,29 @@
       <el-table
         ref="table"
         v-loading="crud.loading"
-        size="mini"
         :data="crud.data"
+        :summary-method="getSummaries"
         highlight-current-row
         show-summary
-        :summary-method="getSummaries"
+        size="mini"
         style="width: 100%;"
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column show-overflow-tooltip prop="workshop_id" label="车间" />
-        <el-table-column show-overflow-tooltip prop="material_code" width="130" label="物料编号"/>
-        <el-table-column show-overflow-tooltip prop="material_name" width="130" label="物料名称"/>
-        <el-table-column prop="ask_time" label="要求到货日期" width="130" show-overflow-tooltip />
-        <el-table-column show-overflow-tooltip prop="qty" min-width="120" label="重量"/>
-<!--        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
-<!--        <el-table-column label="总重量" align="center" prop="total_qty"/>-->
-        <el-table-column label="状态" align="center" prop="status" :formatter="stateFormat"/>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat"/>
-        <el-table-column label="创建人" align="center" prop="create_name" width="150" />
-        <el-table-column label="创建时间" align="center" prop="create_time" width="150" />
-        <el-table-column label="提交人" align="center" prop="audit_namne" width="150" />
-        <el-table-column label="提交时间" align="center" prop="audit_time" width="140px" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column label="车间" prop="workshop_id" show-overflow-tooltip/>
+        <el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
+        <el-table-column :min-width="flexWidth('material_name', crud.data, '物料名称')" label="物料名称" prop="material_name" show-overflow-tooltip/>
+        <el-table-column :min-width="flexWidth('ask_time', crud.data, '要求到货日期')" label="要求到货日期" prop="askTime"/>
+        <el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
+        <!--        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
+        <!--        <el-table-column label="总重量" align="center" prop="total_qty"/>-->
+        <el-table-column :formatter="stateFormat" align="center" label="状态" prop="status"/>
+        <el-table-column :formatter="createModeFormat" align="center" label="生成方式" prop="create_mode" width="110"/>
+        <el-table-column align="center" label="创建人" prop="create_name" width="150"/>
+        <el-table-column align="center" label="创建时间" prop="createTime" width="150"/>
+        <el-table-column align="center" label="备注" prop="remark"/>
+        <el-table-column v-permission="[]" align="center" fixed="right" label="操作" width="120px">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -141,9 +122,9 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <AddDialog @AddChanged="querytable" />
+    <AddDialog @AddChanged="querytable"/>
   </div>
 </template>
 
@@ -169,7 +150,7 @@ export default {
       query: {
         'status': '0'
       },
-      url: '/api/pcsIfPurchaseorder',
+      url: '/api/pcsIfPurchaseorder/query',
       crudMethod: { ...crudPurchase }
     })
   },
@@ -203,27 +184,27 @@ export default {
   },
   methods: {
     getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
+      const { columns, data } = param
+      const sums = []
       columns.forEach((column, index) => {
         if (index === 0) {
-          sums[index] = '合计';
-          return;
+          sums[index] = '合计'
+          return
         }
-        const values = data.map(item => Number(item[column.property]));
-        if (column.property === 'qty') {
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'show_qty') {
           sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
+            const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr;
+              return prev + curr
             } else {
-              return prev;
+              return prev
             }
-          }, 0);
-          sums[index] += ' KG';
+          }, 0)
+          sums[index] = sums[index].toFixed(3) + ' KG'
         }
-      });
-      return sums;
+      })
+      return sums
     },
     bill_typeFormat(row, column) {
       return this.dict.label.ST_INV_RAW_IN_TYPE[row.bill_type]
@@ -247,7 +228,7 @@ export default {
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" rel="stylesheet/scss" scoped>
 ::v-deep .el-dialog__body {
   padding-top: 10px;
 }

mes/qd/src/views/wms/pcs/purchaseorder/purchase.js

@@ -1,67 +1,76 @@
 import request from '@/utils/request'
 
 export function add(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder',
+        method: 'post',
+        data
+    })
 }
 
 export function del(ids) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/delete',
-    method: 'post',
-    data: ids
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/delete',
+        method: 'post',
+        data: ids
+    })
 }
 
 export function edit(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/update',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/update',
+        method: 'post',
+        data
+    })
 }
 
 export function confirm(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/confirm',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/confirm',
+        method: 'post',
+        data
+    })
 }
 
 export function getDtl(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/getDtl',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/getDemandDtl',
+        method: 'post',
+        data
+    })
+}
+
+export function getSemiRealCode(data) {
+    return request({
+        url: '/api/pcsIfPurchaseorder/getSemiRealCode',
+        method: 'post',
+        data
+    })
 }
 
 export function commit(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/commit',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/commit',
+        method: 'post',
+        data
+    })
 }
 
 export function excelImport(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/excelImport',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/excelImport',
+        method: 'post',
+        data
+    })
 }
 
 export default {
-  add,
-  edit,
-  del,
-  confirm,
-  getDtl,
-  commit,
-  excelImport
+    add,
+    edit,
+    del,
+    confirm,
+    getDtl,
+    commit,
+    excelImport,
+    getSemiRealCode
 }

mes/qd/src/views/wms/pcs/purchaseplan/AddDialog.vue

@@ -1,14 +1,14 @@
 <!--suppress ALL -->
 <template>
   <el-dialog
+    :before-close="crud.cancelCU"
     :title="crud.status.title"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
     append-to-body
     fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
     width="1200px"
-    @open="open"
     @close="close"
+    @open="open"
   >
     <el-row v-show="crud.status.cu > 0" :gutter="20" style="margin-bottom: 5px;">
       <el-col :span="20" style="border: 1px solid white">
@@ -17,9 +17,9 @@
       <el-col :span="4">
         <span>
           <el-button
+            :loading="crud.cu === 2"
             icon="el-icon-check"
             size="mini"
-            :loading="crud.cu === 2"
             type="primary"
             @click="crud.submitCU"
           >保存</el-button>
@@ -29,24 +29,24 @@
     </el-row>
 
     <el-form
-      ref="form"
       v-show="false"
-      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+      ref="form"
       :inline="true"
       :model="form"
       :rules="rules"
-      size="mini"
-      label-width="85px"
       label-suffix=":"
+      label-width="85px"
+      size="mini"
+      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
     >
       <el-form-item label="车间" prop="workshop_id">
         <label slot="label">车间</label>
         <el-select
           v-model="form.workshop_id"
-          clearable
-          size="mini"
-          placeholder="全部"
           class="filter-item"
+          clearable
+          placeholder="全部"
+          size="mini"
         >
           <el-option
             v-for="item in dict.product_area"
@@ -57,25 +57,25 @@
         </el-select>
       </el-form-item>
       <el-form-item label="物料编码" prop="material_code">
-        <el-input v-model.trim="form.material_code" disabled class="input-with-select" style="width: 370px;">
+        <el-input v-model.trim="form.material_code" class="input-with-select" disabled style="width: 370px;">
           <el-button slot="append" icon="el-icon-search" @click="insertEvent"/>
         </el-input>
       </el-form-item>
       <el-form-item label="物料名称" prop="material_name">
         <label slot="label">物料名称:</label>
-        <el-input v-model="form.material_name" size="mini" disabled style="width: 210px"/>
+        <el-input v-model="form.material_name" disabled size="mini" style="width: 210px"/>
       </el-form-item>
       <el-form-item label="明细数" prop="detail_count">
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
+        <el-input v-model="form.detail_count" disabled size="mini" style="width: 210px"/>
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
         <el-input-number
           v-model.number="form.total_qty"
           :controls="false"
-          :precision="3"
           :min="0"
+          :precision="3"
           disabled
           style="width: 210px"
         />
@@ -84,10 +84,10 @@
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input
           v-model="form.remark"
-          style="width: 380px;"
-          rows="2"
-          type="textarea"
           :disabled="crud.status.view > 0"
+          rows="2"
+          style="width: 380px;"
+          type="textarea"
         />
       </el-form-item>
     </el-form>
@@ -96,45 +96,50 @@
     <el-table
       ref="table"
       :data="form.tableData"
-      style="width: 100%;"
-      border
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      border
+      style="width: 100%;"
     >
-      <el-table-column type="index" label="序号" width="55" align="center"/>
-      <el-table-column prop="ask_time" label="要求到货日期" width="150"/>
-      <el-table-column prop="material_code" label="物料编码" width="150"/>
-      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称"/>
-      <el-table-column prop="qty" label="需求数量" width="100"/>
-      <el-table-column prop="qty_unit_name" label="数量单位" width="100"/>
-      <el-table-column prop="ask_time" label="确认到货日期" width="250">
+      <el-table-column align="center" label="序号" type="index" width="55"/>
+      <el-table-column label="要求到货日期" prop="ask_time" width="150"/>
+      <el-table-column label="物料编码" prop="material_code" width="150"/>
+      <el-table-column label="物料名称" prop="material_name" show-overflow-tooltip/>
+      <el-table-column label="需求数量" prop="show_qty" width="100"/>
+      <el-table-column label="数量单位" prop="qty_unit_name" show-overflow-tooltip>
+        <template scope="scope">
+          KG
+        </template>
+      </el-table-column>
+      <el-table-column label="确认到货日期" prop="ask_time" width="250">
         <template slot-scope="scope">
           <el-date-picker
             v-model="form.tableData[scope.$index].agree_time"
-            type="date"
-            placeholder="选择日期"
-            align="center"
-            value-format="yyyy-MM-dd"
             :disabled="crud.status.view > 0"
+            align="center"
+            placeholder="选择日期"
+            type="date"
+            value-format="yyyy-MM-dd"
           />
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="po_code" label="采购订单">
+      <el-table-column label="采购订单" prop="po_code" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-input
             v-model="form.tableData[scope.$index].po_code"
-            size="small"
             :controls="false"
             controls-position="right"
+            size="small"
           />
         </template>
       </el-table-column>
-<!--      <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
-<!--      <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
+      <!--      <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
+      <!--      <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
     </el-table>
 
     <MaterDtl
       :dialog-show.sync="materShow"
       :is-single="true"
+      :mater-opt-code="10"
       @setMaterValue="tableChanged"
     />
 
@@ -142,9 +147,9 @@
 </template>
 
 <script>
-import CRUD, {crud, form} from '@crud/crud'
+import CRUD, { crud, form } from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
-import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'
+import crudPurchase from '@/views/wms/pcs/purchaseplan/purchase'
 
 const defaultForm = {
   product_code: '',
@@ -156,13 +161,13 @@ const defaultForm = {
   qty_unit_name: '',
   total_qty: 0,
   detail_count: '0',
-  workshop_id: '',
+  workshop_id: 'A1',
   tableData: []
 }
 
 export default {
   name: 'AddDialog',
-  components: {MaterDtl},
+  components: { MaterDtl },
   mixins: [crud(), form(defaultForm)],
   dicts: ['IO_BILL_STATUS', 'ST_INV_RAW_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
   methods: {

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

@@ -51,7 +51,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.IO_BILL_STATUS"
+                v-for="item in dict.PURCHASE_STATUS"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -69,7 +69,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_CREATE"
+                v-for="item in dict.ST_CREATE_MODE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -150,8 +150,8 @@
         <el-table-column show-overflow-tooltip prop="workshop_id" label="车间"/>
         <el-table-column show-overflow-tooltip prop="material_code" width="130" label="物料编号"/>
         <el-table-column show-overflow-tooltip prop="material_name" width="130" label="物料名称"/>
-        <el-table-column prop="ask_time" label="要求到货日期" width="130" show-overflow-tooltip/>
-        <el-table-column show-overflow-tooltip prop="qty" min-width="120" label="重量"/>
+        <el-table-column prop="askTime" label="要求到货日期" width="130" show-overflow-tooltip/>
+        <el-table-column show-overflow-tooltip prop="show_qty" min-width="120" label="重量"/>
         <el-table-column show-overflow-tooltip prop="agree_time" min-width="120" label="确认交货日期"/>
         <el-table-column show-overflow-tooltip prop="po_code" min-width="120" label="订单编号"/>
         <el-table-column show-overflow-tooltip prop="instor_qty" min-width="120" label="入库重量"/>
@@ -159,9 +159,9 @@
         <!--        <el-table-column label="总重量" align="center" prop="total_qty"/>-->
         <el-table-column label="状态" align="center" prop="status" :formatter="stateFormat"/>
         <el-table-column label="备注" align="center" prop="remark"/>
-        <el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat"/>
+        <el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat" min-width="100" />
         <el-table-column label="创建人" align="center" prop="create_name" width="150"/>
-        <el-table-column label="创建时间" align="center" prop="create_time" width="150"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
         <el-table-column label="提交人" align="center" prop="audit_name" width="150"/>
         <el-table-column label="提交时间" align="center" prop="audit_time" width="140px"/>
         <el-table-column label="采购确认人" align="center" prop="purchase_name" width="150"/>
@@ -244,8 +244,8 @@ export default {
     })
   },
   methods: {
-    getSummaries(param) {
-      const {columns, data} = param;
+        getSummaries(param) {
+      const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
         if (index === 0) {
@@ -253,7 +253,7 @@ export default {
           return;
         }
         const values = data.map(item => Number(item[column.property]));
-        if (column.property === 'qty' || column.property === 'instor_qty') {
+        if (column.property === 'show_qty' || column.property === 'instor_qty') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
@@ -262,7 +262,7 @@ export default {
               return prev;
             }
           }, 0);
-          sums[index] += ' KG';
+          sums[index] = sums[index].toFixed(3) + ' KG';
         }
       });
       return sums;

mes/qd/src/views/wms/pcs/purchaseplan/purchase.js

@@ -1,58 +1,58 @@
 import request from '@/utils/request'
 
 export function add(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder',
+        method: 'post',
+        data
+    })
 }
 
 export function del(ids) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/delete',
-    method: 'post',
-    data: ids
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/delete',
+        method: 'post',
+        data: ids
+    })
 }
 
 export function edit(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/update',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/update',
+        method: 'post',
+        data
+    })
 }
 
 export function confirm(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/confirm',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/confirm',
+        method: 'post',
+        data
+    })
 }
 
 export function getDtl(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/getDtl',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/getDtl',
+        method: 'post',
+        data
+    })
 }
 
 export function commit(data) {
-  return request({
-    url: '/api/pcsIfPurchaseorder/commit',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/api/pcsIfPurchaseorder/commit',
+        method: 'post',
+        data
+    })
 }
 
 export default {
-  add,
-  edit,
-  del,
-  confirm,
-  getDtl,
-  commit
+    add,
+    edit,
+    del,
+    confirm,
+    getDtl,
+    commit
 }

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="销售订单导入"
+    title="aps提交"
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close
@@ -13,6 +13,15 @@
       <div>
         <!-- 搜索 -->
         <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
+
+
+          <el-form-item label="订单阶段:" prop="bill_code">
+            <el-select v-model="form.bill_type" style="width: 350px;">
+              <el-option label="前段" value="2"/>
+              <el-option label="后段" value="3"/>
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="日期区间：" prop="createTime">
             <el-date-picker
               v-model="form.createTime"
@@ -22,9 +31,13 @@
               end-placeholder="结束日期"
             />
           </el-form-item>
-          <el-form-item label="销售订单号:" prop="bill_code">
+
+
+          <!-- <el-form-item label="销售订单号:" prop="bill_code">
             <el-input v-model="form.bill_code" style="width: 350px;"/>
-          </el-form-item>
+          </el-form-item> -->
+
+
         </el-form>
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
         </el-button>
@@ -35,15 +48,15 @@
 
 <script>
 
-import CRUD, {header, presenter} from '@crud/crud'
+import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import crudSap from '@/api/wms/ext/sap'
+import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
 
 export default {
   name: 'importOrder',
-  components: {rrOperation, pagination, DateRangePicker},
+  components: { rrOperation, pagination, DateRangePicker },
   cruds() {
   },
   mixins: [presenter(), header()],
@@ -57,7 +70,7 @@ export default {
     return {
       fullscreenLoading: false,
       dialogVisible: false,
-      form: {}
+      form: { bill_type: '2' }
     }
   },
   watch: {
@@ -74,18 +87,37 @@ export default {
       this.$emit('tableChanged', this.rows)
     },
     queryStruct() {
-
+      // 校验开始日期和结束日期是否为空
+      if (!this.form.createTime || !this.form.createTime[0] || !this.form.createTime[1]) {
+        this.showErrorNotification('请选择日期区间')
+        return
+      }
+      // 校验销售订单号值是否为空
+      if (!this.form.bill_type) {
+        this.showErrorNotification('请选择订单阶段')
+        return
+      }
       this.fullscreenLoading = true
       if (this.form.createTime) {
         this.form.date_begin = this.form.createTime[0]
         this.form.date_end = this.form.createTime[1]
       }
-      crudSap.getSaleOrder(this.form).then(res => {
-        this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+      crudSaleOrder.submit(this.form).then(res => {
+        this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.fullscreenLoading = false
+        this.dialogVisible = false
+        this.form = {} // 清空表单数据
       }).catch(() => {
         this.fullscreenLoading = false
       })
+    },
+    showErrorNotification: function(message) {
+      this.crud.notify(message, CRUD.NOTIFICATION_TYPE.ERROR)
+      this.fullscreenLoading = false
+    },
+    showSuccessNotification: function(message) {
+      this.crud.notify(message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+      this.fullscreenLoading = false
     }
   }
 }

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

@@ -1,27 +1,27 @@
 <template>
   <el-dialog
-    title="导入Excel文件"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="400px"
     :show-close="true"
+    :visible.sync="dialogVisible"
+    append-to-body
+    destroy-on-close
+    title="导入Excel文件"
+    width="400px"
     @close="close"
     @open="open"
   >
     <el-upload
       ref="upload"
-      class="upload-demo"
-      action=""
-      drag
-      :on-exceed="is_one"
-      :limit="1"
       :auto-upload="false"
-      :multiple="false"
-      :show-file-list="true"
-      :on-change="uploadByJsqd"
       :file-list="fileList"
+      :limit="1"
+      :multiple="false"
+      :on-change="uploadByJsqd"
+      :on-exceed="is_one"
+      :show-file-list="true"
       accept=".xlsx,.xls"
+      action=""
+      class="upload-demo"
+      drag
     >
       <i class="el-icon-upload" />
       <div class="el-upload__text">

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

@@ -68,8 +68,19 @@
               placeholder="请选择"
             />
           </el-form-item>
-          <rrOperation :crud="crud" />
+          <rrOperation :crud="crud"/>
         </el-form>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="deleteApsData"
+        >
+          清空测试数据
+        </el-button>
+
       </div>
       <crudOperation :permission="permission">
         <el-button
@@ -82,7 +93,8 @@
         >
           导入
         </el-button>
-        <!-- <el-button
+
+        <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -90,8 +102,8 @@
           size="mini"
           @click="importin"
         >
-          同步
-        </el-button> -->
+          aps提交
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -110,7 +122,9 @@
         >
           <el-form-item label="车间" prop="product_area">
             <!-- unit_list-->
-            <el-select v-model="form.product_area" placeholder="">
+            <el-select v-model="form.product_area" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+                       placeholder=""
+            >
               <el-option
                 v-for="item in dict.product_area"
                 :key="item.value"
@@ -120,16 +134,16 @@
             </el-select>
           </el-form-item>
           <el-form-item label="销售单号" prop="sale_code">
-            <el-input v-model="form.sale_code" style="width: 200px;" />
+            <el-input v-model="form.sale_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+                      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 label="合同号" prop="contract_code">
+            <el-input v-model="form.contract_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+                      style="width: 200px;"
+            />
           </el-form-item>
-          <el-form-item label="订单数量" prop="sale_qty">
-            <el-input-number v-model="form.sale_qty" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="计量单位" prop="unit_name">
-            <!-- unit_list-->
+          <!-- <el-form-item label="计量单位" prop="unit_name">
             <el-select v-model="form.qty_unit_id" placeholder="">
               <el-option
                 v-for="item in unit_list"
@@ -138,11 +152,13 @@
                 :value="item.value"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="物料编码" prop="material_code">
-            <el-input v-model="form.material_code" style="width: 200px;" />
+            <el-input v-model="form.material_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+                      style="width: 200px;"
+            />
           </el-form-item>
-          <el-form-item label="客户名称" prop="cust_name">
+          <!-- <el-form-item label="客户名称" prop="cust_name">
             <el-select v-model="form.cust_code" placeholder="">
               <el-option
                 v-for="item in customer_list"
@@ -151,9 +167,20 @@
                 :value="item.value"
               />
             </el-select>
+          </el-form-item> -->
+          <el-form-item label="计划交期时间" prop="plandeliver_date">
+            <el-date-picker
+              v-model="form.plandeliverDate"
+              value-format="yyyy-MM-dd"
+              type="date"
+              style="width: 200px;"
+            />
+            <el-form-item label="订单数量" prop="sale_qty">
+              <el-input-number v-model="form.sale_qty" style="width: 200px;"/>
+            </el-form-item>
           </el-form-item>
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" style="width: 200px;" />
+            <el-input v-model="form.remark" style="width: 200px;"/>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -162,7 +189,8 @@
             :loading="crud.cu === 2"
             type="primary"
             @click="crud.submitCU"
-          >确认</el-button>
+          >确认
+          </el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -174,7 +202,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="55"/>
         <el-table-column
           prop="sale_code"
           label="销售单号"
@@ -182,26 +210,20 @@
           show-overflow-tooltip
         />
         <el-table-column
-        prop="seq_no"
-        label="销售单行号"
-        min-width="100"
-        show-overflow-tooltip
-        />
-        <!-- <el-table-column prop="seq_no" label="明细序号" /> -->
-        <el-table-column
-          prop="sale_type"
-          label="销售单类型"
+          prop="seq_no"
+          label="销售单行号"
           min-width="100"
           show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
-          </template>
-        </el-table-column>
+        />
+        <!-- <el-table-column prop="seq_no" label="明细序号" /> -->
 
-        <el-table-column prop="contract_code" label="合同号" :min-width="flexWidth('contract_code', crud.data, '合同号')" />
+        <el-table-column prop="contract_code" label="合同号"
+                         :min-width="flexWidth('contract_code', crud.data, '合同号')"
+        />
 
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code', crud.data, '物料编码')" />
+        <el-table-column prop="material_code" label="物料编码"
+                         :min-width="flexWidth('material_code', crud.data, '物料编码')"
+        />
 
         <el-table-column
           prop="material_spec"
@@ -222,7 +244,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="sale_qty" label="订单数量" />
+        <el-table-column prop="sale_qty" label="订单数量"/>
 
         <el-table-column
           prop="qty_unit_name"
@@ -230,76 +252,106 @@
           show-overflow-tooltip
           min-width="80"
         />
-
-        <el-table-column prop="status" label="状态">
+        <el-table-column
+          prop="plandeliverDate"
+          label="前段计划交期"
+          min-width="100"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="status" label="前段状态">
           <template slot-scope="scope">
             {{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
           </template>
         </el-table-column>
-
         <el-table-column
-          prop="plandeliverDate"
-          label="计划交期"
+          prop="behindPlandeliverDate"
+          label="后段计划交期"
           min-width="100"
           show-overflow-tooltip
         />
+        <el-table-column prop="behind_submit_flag" label="后段状态">
+          <template slot-scope="scope">
+            {{ dict.label.PCS_SALE_STATUS[scope.row.behind_submit_flag] }}
+          </template>
+        </el-table-column>
 
         <el-table-column
-          prop="early_start_time"
-          label="最早开始时间"
-          min-width="100"
+          prop="rawmaterial_name"
+          label="原材料信息"
+          :min-width="flexWidth('rawmaterial_name', crud.data, '原材料信息')"
           show-overflow-tooltip
         />
-
-        <el-table-column prop="create_name" label="创建人" />
         <el-table-column
-          prop="createTime"
-          label="创建时间"
-          :min-width="flexWidth('createTime', crud.data, '创建时间')"
+          prop="rate_qty"
+          label="单重"
+          :min-width="flexWidth('rate_qty', crud.data, '单重')"
+          show-overflow-tooltip
         />
+        <el-table-column
+          prop="canuse_qty"
+          label="原材料库存"
+          :min-width="flexWidth('canuse_qty', crud.data, '原材料库存')"
+          show-overflow-tooltip
+        />
+        <!--        <el-table-column-->
+        <!--          prop="early_start_time"-->
+        <!--          label="最早开始时间"-->
+        <!--          min-width="100"-->
+        <!--          show-overflow-tooltip-->
+        <!--        />-->
+        <el-table-column
+          prop="product_qty"
+          label="生产数量"
+          :min-width="flexWidth('product_qty', crud.data, '生产数量')"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="sale_type"
+          label="销售单类型"
+          min-width="100"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="create_mode" label="生成方式" min-width="100">
           <template slot-scope="scope">
             {{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
           </template>
         </el-table-column>
+        <el-table-column prop="create_name" label="创建人"/>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          :min-width="flexWidth('createTime', crud.data, '创建时间')"
+        />
+        <el-table-column prop="update_time" label="修改时间"
+                         :min-width="flexWidth('update_time',crud.data,'修改时间')"
+        />
         <el-table-column
           prop="remark"
           label="备注"
           show-overflow-tooltip
           min-width="200"
         />
-
-        <!-- <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" /> -->
-        <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-        <el-table-column
-          prop="create_time"
-          label="创建时间"
-          min-width="120"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="confirm_time"
-          label="修改时间"
-          min-width="120"
-          show-overflow-tooltip
-        />
-        <!-<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
               :permission="permission"
             />
           </template>
-        </el-table-column>-->
+        </el-table-column> -->
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
     <UploadDialog
       :dialog-show.sync="uploadShow"
       @tableChanged3="tableChanged3"
     />
-    <Dialog :dialog-show.sync="dialogShow" />
+    <Dialog :dialog-show.sync="dialogShow"/>
   </div>
 </template>
 
@@ -315,11 +367,13 @@ import pagination from '@crud/Pagination'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
 
 const defaultForm = {
   sale_id: null,
   sale_code: null,
   seq_no: null,
+  contract_code: null,
   sale_type: null,
   material_id: null,
   status: null,
@@ -357,7 +411,7 @@ export default {
       sort: 'sale_id,desc',
       optShow: {
         add: true,
-        edit: false,
+        edit: true,
         del: false,
         reset: true,
         download: false
@@ -372,7 +426,11 @@ export default {
       classes3: [],
       uploadShow: false,
       dialogShow: false,
-      permission: {},
+      permission: {
+        add: ['admin', 'roles:add'],
+        edit: ['admin', 'roles:edit'],
+        del: ['admin', 'roles:del']
+      },
       queryTypeOptions: [{ key: 'sale_code', display_name: '销售单号' }]
     }
   },
@@ -440,6 +498,11 @@ export default {
         this.classes3 = data
       })
     },
+    deleteApsData() {
+      crudSaleOrder.deleteTestData().then((res) => {
+        this.crud.notify('清空成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true

mes/qd/src/views/wms/pcs/saleorder/saleOrder.js

@@ -32,4 +32,18 @@ export function excelImport(data) {
   })
 }
 
-export default { add, edit, del, excelImport }
+export function submit(data) {
+  return request({
+    url: 'api/mpsSaleOrder/submit',
+    method: 'post',
+    data
+  })
+}
+export function deleteTestData() {
+  return request({
+    url: 'api/mpsSaleOrder/deleteTestData',
+    method: 'post'
+  })
+}
+
+export default { add, edit, del, excelImport, submit, deleteTestData }

mes/qd/src/views/wms/product_manage/workorder/AddDialog.vue

@@ -1,10 +1,10 @@
 <template>
   <el-dialog
-    title="批量新增"
-    append-to-body
     :visible.sync="dialogVisible"
-    fullscreen
+    append-to-body
     destroy-on-close
+    fullscreen
+    title="批量新增"
     width="1000px"
     @close="close"
     @open="open"
@@ -12,7 +12,7 @@
     <div class="crud-opts2" style="margin-bottom: 5px;">
       <span class="crud-opts-right2">
         <!--左侧插槽-->
-        <slot name="left"/>
+        <slot name="left" />
         <el-button type="primary" @click="insertDtl">新增一行</el-button>
         <el-button type="primary" @click="copyAdd">复制新增</el-button>
       </span>
@@ -20,30 +20,30 @@
     <el-table
       ref="table"
       :data="tableData"
-      style="width: 100%;"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       border
       highlight-current-row
+      style="width: 100%;"
       @row-click="clickRow"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column type="index" label="序号" width="50" align="center"/>
-      <el-table-column align="center" label="操作" width="100" fixed="right">
+      <el-table-column align="center" label="序号" type="index" width="50" />
+      <el-table-column align="center" fixed="right" label="操作" width="100">
         <template scope="scope">
           <el-button
-            type="danger"
             class="filter-item"
-            size="mini"
             icon="el-icon-delete"
+            size="mini"
+            type="danger"
             @click.native.prevent="deleteRow(scope.$index, tableData)"
           />
         </template>
       </el-table-column>
-      <el-table-column prop="order_type_scode" label="工单类型" align="center" width="120px">
+      <el-table-column align="center" label="工单类型" prop="order_type_scode" width="120px">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.order_type_scode"
-            class="filter-item"
             :disabled="scope.row.edit"
+            class="filter-item"
           >
             <el-option
               v-for="item in dict.PDM_BI_ORDERTYPE"
@@ -54,12 +54,12 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column prop="workprocedure_id" label="所属工序" align="center" width="150px">
+      <el-table-column align="center" label="所属工序" prop="workprocedure_id" width="150px">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.workprocedure_id"
-            class="filter-item"
             :disabled="scope.row.edit"
+            class="filter-item"
           >
             <el-option
               v-for="item in workprocedureList"
@@ -71,34 +71,34 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="produce_date" label="生产日期" align="center" width="250px">
+      <el-table-column align="center" label="生产日期" prop="produce_date" width="250px">
         <template slot-scope="scope">
-          <el-date-picker v-model="scope.row.produce_date" type="date" value-format="yyyy-MM-dd"/>
+          <el-date-picker v-model="scope.row.produce_date" type="date" value-format="yyyy-MM-dd" />
         </template>
       </el-table-column>
-      <el-table-column v-if="false" prop="material_id" label="物料标识" align="center"/>
-      <el-table-column prop="materialCode" label="物料编码" align="center" width="190px">
+      <el-table-column v-if="false" align="center" label="物料标识" prop="material_id" />
+      <el-table-column align="center" label="物料编码" prop="material_code" width="190px">
         <template scope="scope">
-          <el-input v-model="scope.row.materialCode" disabled class="input-with-select">
-            <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)"/>
+          <el-input v-model="scope.row.material_code" class="input-with-select" disabled>
+            <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
           </el-input>
         </template>
       </el-table-column>
-      <el-table-column prop="material_name" label="物料名称" align="center" width="250px"/>
-      <el-table-column prop="material_spec" label="物料规格" align="center" width="150px"/>
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="计划数量" align="center" width="100px">
+      <el-table-column align="center" label="物料名称" prop="material_name" width="250px" />
+      <el-table-column align="center" label="物料规格" prop="material_spec" width="150px" />
+      <el-table-column align="center" label="计划数量" prop="plan_qty" show-overflow-tooltip width="100px">
         <template scope="scope">
-          <el-input v-show="!scope.row.edit" v-model="scope.row.plan_qty" size="mini"/>
+          <el-input v-show="!scope.row.edit" v-model="scope.row.plan_qty" size="mini" />
           <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="shift_type_scode" label="班次类型" align="center" width="110px">
+      <el-table-column align="center" label="班次类型" prop="shift_type_scode" width="110px">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.shift_type_scode"
+            :disabled="scope.row.edit"
             class="filter-item"
             @change="(val)=>change(val,scope.$index,scope.row)"
-            :disabled="scope.row.edit"
           >
             <el-option
               v-for="item in dict.PDM_BI_SHIFTTYPE"
@@ -109,32 +109,32 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column prop="planproducestart_date" label="计划开始时间" align="center" width="250px">
+      <el-table-column align="center" label="计划开始时间" prop="planproducestart_date" width="250px">
         <template slot-scope="scope">
           <el-date-picker
             v-model="scope.row.planproducestart_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
             style="width: 200px;"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
           />
         </template>
       </el-table-column>
-      <el-table-column prop="planproduceend_date" label="计划结束时间" align="center" width="250px">
+      <el-table-column align="center" label="计划结束时间" prop="planproduceend_date" width="250px">
         <template slot-scope="scope">
           <el-date-picker
             v-model="scope.row.planproduceend_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
             style="width: 200px;"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
           />
         </template>
       </el-table-column>
-      <el-table-column prop="sale_id" label="销售单标识" align="center" width="150px">
+      <el-table-column align="center" label="销售单标识" prop="sale_id" width="150px">
         <template scope="scope">
-          <el-input v-model="scope.row.sale_id"/>
+          <el-input v-model="scope.row.sale_id" />
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="is_needmove" label="是否搬运" align="center" width="150px">
+      <el-table-column align="center" label="是否搬运" prop="is_needmove" show-overflow-tooltip width="150px">
         <template scope="scope">
           <el-radio
             v-for="item in dict.IS_OR_NOT"
@@ -145,7 +145,13 @@
           </el-radio>
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="is_canupdate_update" label="允许修改报工数量" align="center" width="200px">
+      <el-table-column
+        align="center"
+        label="允许修改报工数量"
+        prop="is_canupdate_update"
+        show-overflow-tooltip
+        width="200px"
+      >
         <template scope="scope">
           <el-radio
             v-for="item in dict.IS_OR_NOT"
@@ -156,9 +162,15 @@
           </el-radio>
         </template>
       </el-table-column>
-      <el-table-column prop="orderNum" label="订单数量" align="center" width="150px">
+      <el-table-column align="center" label="订单数量" prop="orderNum" width="150px">
         <template scope="scope">
-          <el-input v-model="scope.row.orderNum" type="number" :min="1" oninput="value = value.replace(/[^\d]/g, '')" style="width: 200px;"/>
+          <el-input
+            v-model="scope.row.orderNum"
+            :min="1"
+            oninput="value = value.replace(/[^\d]/g, '')"
+            style="width: 200px;"
+            type="number"
+          />
         </template>
       </el-table-column>
     </el-table>
@@ -230,7 +242,7 @@ export default {
         is_used_fxx: false,
         report_qty: '',
         material_id: '',
-        materialCode: '',
+        material_code: '',
         material_weight: '',
         planproducestart_date: date,
         planproduceend_date: formatter1,
@@ -290,14 +302,16 @@ export default {
       this.tableData.splice(index, 1, row)
     },
     setMaterValue(row) {
+      debugger
+      console.log(row)
       this.nowrow.material_id = row.material_id
-      this.nowrow.materialCode = row.material_code
+      this.nowrow.material_code = row.material_code
       this.nowrow.material_name = row.material_name
+      this.$set(this.nowrow, 'material_name', row.material_name)
       this.nowrow.material_spec = row.material_spec
       this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
     },
     clickRow(row) {
-
       this.current_row = row
     },
     dateFormatter(str) {

mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue

@@ -1,18 +1,18 @@
 <template>
   <el-dialog
-    title="工单详情"
+    :visible.sync="dialogVisible"
     append-to-body
     fullscreen
-    :visible.sync="dialogVisible"
-    @open="open"
+    title="工单详情"
     @close="close"
+    @open="open"
   >
     <el-card class="box-card" shadow="never">
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="180px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" disabled label-width="180px" size="mini">
         <el-form-item label="工单编码">
           <el-input v-model="form.workorder_code" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="所属工序" >
+        <el-form-item label="所属工序">
           <el-input v-model="form.workprocedure_name" style="width: 200px;" />
         </el-form-item>
         <el-form-item v-if="false" label="物料标识">
@@ -20,25 +20,25 @@
         </el-form-item>
         <el-form-item label="物料编码">
           <el-input
-            v-model="form.materialCode"
-            style="width: 200px;"
+            v-model="form.material_code"
             clearable
+            style="width: 200px;"
+            @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
             @focus="materialShow=true"
-            @clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
           />
         </el-form-item>
         <el-form-item label="物料名称">
           <el-input
             v-model="form.material_name"
-            style="width: 200px;"
             disabled
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item label="物料规格">
           <el-input
             v-model="form.material_spec"
-            style="width: 200px;"
             disabled
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item label="物料单重">
@@ -50,42 +50,42 @@
         <el-form-item label="计划开始时间">
           <el-date-picker
             v-model="form.planproducestart_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
             style="width: 200px;"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
         <el-form-item label="计划结束时间">
           <el-date-picker
             v-model="form.planproduceend_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
             style="width: 200px;"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
         <el-form-item label="实际开始时间">
           <el-date-picker
             v-model="form.realproducestart_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
             style="width: 200px;"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
         <el-form-item label="实际结束时间">
           <el-date-picker
             v-model="form.realproduceend_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
             style="width: 200px;"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
         <el-form-item label="班次类型">
           <el-select
             v-model="form.shift_type_scode"
-            style="width: 200px"
             clearable
             filterable
             placeholder="请选择"
+            style="width: 200px"
             @change="crud.toQuery"
           >
             <el-option
@@ -102,18 +102,22 @@
         <el-form-item label="销售单标识">
           <el-input v-model="form.sale_id" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="是否搬运" prop="is_needmove" :formatter="formatBoolean" >
+        <el-form-item :formatter="formatBoolean" label="是否搬运" prop="is_needmove">
           <el-select
-            v-model="form.is_needmove" style="width: 200px" clearable filterable >
-            <el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value"/>
+            v-model="form.is_needmove"
+            clearable
+            filterable
+            style="width: 200px"
+          >
+            <el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="允许修改报工数量">
           <el-select
             v-model="form.is_canupdate_update"
-            style="width: 200px"
             clearable
             filterable
+            style="width: 200px"
           >
             <el-option
               v-for="item in trueorfalse"
@@ -150,22 +154,24 @@
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
           <el-select
-            v-model="form.package_ext.auto_confirm" style="width: 200px"  >
-            <el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
+            v-model="form.package_ext.auto_confirm"
+            style="width: 200px"
+          >
+            <el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机确认时间" prop="time">
           <el-input-number
             v-model="form.package_ext.time"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="码盘数量" prop="tray_num">
           <el-input-number
             v-model="form.package_ext.tray_num"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
@@ -187,50 +193,50 @@
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每箱袋数" prop="one_box_package_qty">
           <el-input-number
             v-model="form.package_ext.one_box_package_qty"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总箱数" prop="box_num">
           <el-input-number
             v-model="form.package_ext.box_num"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每袋数量" prop="one_package_qty">
           <el-input-number
             v-model="form.package_ext.one_package_qty"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总袋数" prop="package_qty">
           <el-input-number
             v-model="form.package_ext.package_qty"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="满托数量" prop="tray_full_num">
           <el-input-number
             v-model="form.package_ext.tray_full_num"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="箱型模版" prop="box_type">
           <el-input-number
             v-model="form.package_ext.box_type"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="目标巷道" prop="target_roadway">
           <el-input-number
             v-model="form.package_ext.target_roadway"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
         <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="是否翻转" prop="is_flip">
@@ -242,11 +248,15 @@
           >{{ item.label }}
           </el-radio>
         </el-form-item>
-        <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="码垛模版号" prop="lane_tray_template">
+        <el-form-item
+          v-if="form.workprocedure_id == '1689437952540807169'"
+          label="码垛模版号"
+          prop="lane_tray_template"
+        >
           <el-input-number
             v-model="form.package_ext.lane_tray_template"
-            style="width: 200px;"
             clearable
+            style="width: 200px;"
           />
         </el-form-item>
       </el-form>
@@ -263,36 +273,49 @@
     <el-table
       ref="table"
       :data="tableData"
-      style="width: 100%;"
-      max-height="300"
-      border
-      :highlight-current-row="true"
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      :highlight-current-row="true"
+      border
+      max-height="300"
+      style="width: 100%;"
     >
-      <el-table-column prop="workorder_code" label="工单编号" />
-      <el-table-column prop="seq_number" label="报工顺序" :min-width="flexWidth('seq_number',tableData,'报工顺序')"/>
-      <el-table-column prop="shift_type_scode" label="班次类型">
+      <el-table-column label="工单编号" prop="workorder_code" />
+      <el-table-column :min-width="flexWidth('seq_number',tableData,'报工顺序')" label="报工顺序" prop="seq_number" />
+      <el-table-column label="班次类型" prop="shift_type_scode">
         <template slot-scope="scope">
           {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
         </template>
       </el-table-column>
-      <el-table-column prop="product_area" label="生产车间" />
-      <el-table-column prop="device_code" label="设备编码" align="center" :min-width="flexWidth('device_code',tableData,'设备编码')"/>
-      <el-table-column prop="needproduct_qty" label="待生产数" />
-      <el-table-column prop="report_qty" label="报工数量" />
-      <el-table-column prop="nok_qty" label="报废数量" />
-      <el-table-column prop="repare_qty" label="报修数量" />
-      <el-table-column prop="person_finish_qty" label="人员期末数量" :min-width="flexWidth('person_finish_qty',tableData,'人员期末数量')"/>
-      <el-table-column prop="operatetime_start" label="开始时间" :min-width="flexWidth('operatetime_start',tableData,'开工时间')"/>
-      <el-table-column prop="operatetime_end" label="结束时间" />
-      <el-table-column prop="report_status" label="报工状态" >
+      <el-table-column label="生产车间" prop="product_area" />
+      <el-table-column
+        :min-width="flexWidth('device_code',tableData,'设备编码')"
+        align="center"
+        label="设备编码"
+        prop="device_code"
+      />
+      <el-table-column label="待生产数" prop="needproduct_qty" />
+      <el-table-column label="报工数量" prop="report_qty" />
+      <el-table-column label="报废数量" prop="nok_qty" />
+      <el-table-column label="报修数量" prop="repare_qty" />
+      <el-table-column
+        :min-width="flexWidth('person_finish_qty',tableData,'人员期末数量')"
+        label="人员期末数量"
+        prop="person_finish_qty"
+      />
+      <el-table-column
+        :min-width="flexWidth('operatetime_start',tableData,'开工时间')"
+        label="开始时间"
+        prop="operatetime_start"
+      />
+      <el-table-column label="结束时间" prop="operatetime_end" />
+      <el-table-column label="报工状态" prop="report_status">
         <template slot-scope="scope">
-          {{ reportStatus[scope.row.report_status-1].label }}
+          {{ reportStatus[scope.row.report_status - 1].label }}
         </template>
       </el-table-column>
-      <el-table-column prop="produce_person_name" label="操作人" align="center" />
-      <el-table-column prop="confirm_name" label="审核人" align="center" />
-      <el-table-column prop="confirm_time" label="审核时间" align="center" />
+      <el-table-column align="center" label="操作人" prop="produce_person_name" />
+      <el-table-column align="center" label="审核人" prop="confirm_name" />
+      <el-table-column align="center" label="审核时间" prop="confirm_time" />
     </el-table>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="dialogVisible = false">关  闭</el-button>
@@ -309,8 +332,8 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
   name: 'ViewDialog',
-  components: {  },
-  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT' ],
+  components: {},
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
   mixins: [crud()],
   props: {
     dialogShow: {
@@ -327,9 +350,15 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      auto_confirm: [ { value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
-      trueorfalse:[{value: true, label: '是' }, {value: false, label: '否'}],
-      reportStatus:[{value: '1', label: '创建记录' }, {value: '2', label: '报工完成'}, {value: '3', label: '审核完成'}],
+      auto_confirm: [{ value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, {
+        value: '3',
+        label: '人工确认'
+      }],
+      trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
+      reportStatus: [{ value: '1', label: '创建记录' }, { value: '2', label: '报工完成' }, {
+        value: '3',
+        label: '审核完成'
+      }],
       form: {
         sale_id: null,
         class_name: null,
@@ -368,8 +397,7 @@ export default {
       },
       workprocedureList: [],
       tableData: [],
-      rules: {
-      }
+      rules: {}
     }
   },
   watch: {
@@ -386,15 +414,15 @@ export default {
       crudProduceshiftorder.reportQuery3({ workorder_code: this.form.workorder_code }).then(res => {
         this.tableData = res.content
       })
-      if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
+      if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length > 3) {
         this.form.package_ext = JSON.parse(this.form.package_ext)
       }
     },
     close() {
       this.$emit('AddChanged')
-      if (JSON.stringify(this.form.package_ext).length>3){
+      if (JSON.stringify(this.form.package_ext).length > 3) {
         this.form.package_ext = JSON.stringify(this.form.package_ext)
-      }else {
+      } else {
         this.form.package_ext = ''
       }
     },
@@ -413,7 +441,7 @@ export default {
         'material_id': this.form.material_id
       }
       crudClassstandard.queryClassById(param).then(res => {
-        this.$set(this.form,'class_name',res.content[0].class_name)
+        this.$set(this.form, 'class_name', res.content[0].class_name)
       })
     },
     getworkprocedure() {
@@ -437,11 +465,13 @@ export default {
   display: flex;
   align-items: center;
 }
+
 .crud-opts2 .crud-opts-right2 {
   margin-left: auto;
   padding: 4px 4px;
 }
-.input-with-select  {
+
+.input-with-select {
   background-color: #fff;
 }
 </style>

mes/qd/src/views/wms/product_manage/workorder/index.vue

@@ -7,18 +7,18 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="90px"
           label-suffix=":"
+          label-width="90px"
         >
           <el-form-item label="生产车间">
             <el-select
               v-model="query.product_area"
+              class="filter-item"
               clearable
               filterable
+              placeholder="区域类型"
               size="mini"
               style="width: 200px;"
-              placeholder="区域类型"
-              class="filter-item"
               @change="crud.toQuery()"
             >
               <el-option
@@ -34,51 +34,60 @@
           <el-form-item label="工单检索">
             <el-input
               v-model="query.workorder_code"
-              clearable
-              size="mini"
-              placeholder="工单编码、工单标识"
-              style="width: 200px;"
               class="filter-item"
+              clearable
+              placeholder="工单编码、工单标识"
+              size="mini"
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item label="物料搜索">
             <el-input
               v-model="query.material"
-              clearable
-              size="mini"
-              placeholder="物料编码、名称或规格"
-              style="width: 200px;"
               class="filter-item"
+              clearable
+              placeholder="物料编码、名称或规格"
+              size="mini"
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item label="所属工序">
-            <el-select v-model="query.workprocedure_code" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
+            <el-select
+              v-model="query.workprocedure_id"
+              class="filter-item"
+              clearable
+              filterable
+              placeholder="所属工序"
+              size="small"
+              style="width: 220px"
+              @change="changeHeader(query.search, query.workprocedure_id)"
+            >
               <el-option
                 v-for="item in workprocedureList"
-                :key="item.workprocedure_code"
+                :key="item.workprocedure_id"
                 :label="item.workprocedure_name"
-                :value="item.workprocedure_code"
+                :value="item.workprocedure_id"
               />
             </el-select>
           </el-form-item>
           <el-form-item label="设备搜索">
             <el-input
               v-model="query.device_code"
-              clearable
-              size="mini"
-              placeholder="设备编号"
-              style="width: 200px;"
               class="filter-item"
+              clearable
+              placeholder="设备编号"
+              size="mini"
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item label=" 工单状态">
             <el-select
               v-model="order_status"
-              style="width: 200px"
+              class="filter-item"
               clearable
               multiple
               placeholder="请选择"
-              class="filter-item"
+              style="width: 200px"
               @change="handTaskStatus"
             >
               <el-option
@@ -96,10 +105,10 @@
           <el-form-item label="班次类型">
             <el-select
               v-model="query.shift_type_scode"
-              style="width: 200px"
               clearable
               filterable
               placeholder="请选择"
+              style="width: 200px"
               @change="crud.toQuery"
             >
               <el-option
@@ -110,59 +119,70 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="生产日期">
+          <el-form-item label="计划日期">
             <el-date-picker
-              v-model="query.createTime"
+              v-model="query.planTime"
+              :default-time="['00:00:00','23:59:59']"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
               type="daterange"
               value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
               @change="crud.toQuery"
             />
           </el-form-item>
-<!--          <el-form-item label="物料系列">-->
-<!--            <treeselect-->
-<!--              v-model="query.product_series"-->
-<!--              :options="classes3"-->
-<!--              :auto-load-root-options="false"-->
-<!--              :load-options="loadChildNodes"-->
-<!--              style="width: 200px;"-->
-<!--              placeholder="请选择"-->
-<!--            />-->
-<!--          </el-form-item>-->
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              :default-time="['00:00:00','23:59:59']"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <!--          <el-form-item label="物料系列">-->
+          <!--            <treeselect-->
+          <!--              v-model="query.product_series"-->
+          <!--              :options="classes3"-->
+          <!--              :auto-load-root-options="false"-->
+          <!--              :load-options="loadChildNodes"-->
+          <!--              style="width: 200px;"-->
+          <!--              placeholder="请选择"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
           <el-form-item label="订单检索">
             <el-input
               v-model="query.sale_id"
-              clearable
-              size="mini"
-              placeholder="订单编码、订单标识"
-              style="width: 200px;"
               class="filter-item"
+              clearable
+              placeholder="订单编码、订单标识"
+              size="mini"
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item label="是否异常">
             <el-switch
               v-model="query.is_error"
-              active-value="0"
-              inactive-value="1"
               active-color="#C0CCDA"
+              active-value="0"
               inactive-color="#409EFF"
+              inactive-value="1"
               @change="crud.toQuery"
             />
           </el-form-item>
-          <rrOperation :crud="crud" />
+          <rrOperation :crud="crud"/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
           slot="right"
+          :disabled="crud.selections.length !== 1"
           class="filter-item"
-          type="info"
           icon="el-icon-position"
           size="mini"
-          :disabled="crud.selections.length !== 1"
+          type="info"
           @click="crud.toCopy(crud.selections[0])"
         >
           复制新增
@@ -180,42 +200,42 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="warning"
           icon="el-icon-upload2"
           size="mini"
+          type="warning"
           @click="uploadShow = true"
         >
           导入
         </el-button>
         <el-button
           slot="right"
+          :disabled="is_disabled(crud.selections)"
           class="filter-item"
-          type="success"
           icon="el-icon-position"
           size="mini"
-          :disabled="is_disabled(crud.selections)"
+          type="success"
           @click="submits(crud.selections)"
         >
           下发
         </el-button>
         <el-button
           slot="right"
+          :disabled="is_disabled(crud.selections)"
           class="filter-item"
-          type="success"
           icon="el-icon-position"
           size="mini"
-          :disabled="is_disabled(crud.selections)"
+          type="success"
           @click="unSubmits(crud.selections)"
         >
           取消下发
         </el-button>
         <el-button
           slot="right"
+          :disabled="is_disopen(crud.selections)"
           class="filter-item"
-          type="success"
           icon="el-icon-position"
           size="mini"
-          :disabled="is_disopen(crud.selections)"
+          type="success"
           @click="openstart(crud.selections)"
         >
           开工
@@ -223,34 +243,42 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
           icon="el-icon-position"
           size="mini"
+          type="success"
           @click="report(crud.selections)"
         >
           报工审核
         </el-button>
         <el-button
           slot="right"
+          :disabled="is_finished(crud.selections)"
           class="filter-item"
-          type="danger"
           icon="el-icon-position"
           size="mini"
-          :disabled="is_finished(crud.selections)"
+          type="danger"
           @click="forceFinish(crud.selections)"
         >
           强制完成
         </el-button>
       </crudOperation>
-      <!--表单组件-->
+      <!--新增，修改弹窗-->
       <el-dialog
-        :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :close-on-click-modal="false"
         :title="crud.status.title"
+        :visible.sync="crud.status.cu > 0"
         width="1200px"
       >
-        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-width="160px"
+          size="mini"
+          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+        >
           <el-form-item label="生产车间" prop="product_area">
             <el-select
               v-model="form.product_area"
@@ -269,9 +297,9 @@
           <el-form-item label="所属工序" prop="workprocedure_id">
             <el-select
               v-model="form.workprocedure_id"
+              class="filter-item"
               clearable
               size="mini"
-              class="filter-item"
               style="width: 200px;"
               @change="getNotWorkDeviceByWorkproceduceId(form.workprocedure_id)"
             >
@@ -286,8 +314,8 @@
           <el-form-item v-if="crud.status.add" label="生产设备" prop="device_code">
             <el-select
               v-model="form.device_code"
-              clearable
               class="filter-item"
+              clearable
               style="width: 200px;"
               @change="changeEvent1(form.device_code)"
             >
@@ -300,63 +328,63 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if="false" label="物料标识" prop="material_id">
-            <el-input v-model="form.material_id" style="width: 200px;" />
+            <el-input v-model="form.material_id" style="width: 200px;"/>
           </el-form-item>
-          <el-form-item label="物料编码" prop="materialCode">
+          <el-form-item label="物料编码" prop="material_code">
             <el-input
-              v-model="form.materialCode"
-              style="width: 200px;"
+              v-model="form.material_code"
               clearable
+              style="width: 200px;"
+              @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
               @focus="materialShow=true"
-              @clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
             />
           </el-form-item>
           <el-form-item label="物料名称" prop="material_name">
             <el-input
               v-model="form.material_name"
-              style="width: 200px;"
               disabled
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item label="物料规格" prop="material_spec">
             <el-input
               v-model="form.material_spec"
-              style="width: 200px;"
               disabled
+              style="width: 200px;"
             />
           </el-form-item>
-          <el-form-item label="物料单重" prop="material_weight">
+          <!-- <el-form-item label="物料单重" prop="material_weight">
             <el-input v-model="form.material_weight" style="width: 200px;" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="计划数量" prop="plan_qty">
-            <el-input v-model="form.plan_qty" style="width: 200px;" />
+            <el-input v-model="form.plan_qty" style="width: 200px;"/>
           </el-form-item>
           <el-form-item label="计划开始时间" prop="planproducestart_date">
             <el-date-picker
               v-model="form.planproducestart_date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
               style="width: 200px;"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
             />
           </el-form-item>
           <el-form-item label="计划结束时间" prop="planproduceend_date">
             <el-date-picker
               v-model="form.planproduceend_date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
               style="width: 200px;"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
             />
           </el-form-item>
           <el-form-item v-if="crud.status.edit" label="实际数量" prop="report_qty">
-            <el-input v-model="form.real_qty" style="width: 200px;" />
+            <el-input v-model="form.real_qty" disabled style="width: 200px;"/>
           </el-form-item>
           <el-form-item label="班次类型" prop="shift_type_scode">
             <el-select
               v-model="form.shift_type_scode"
-              style="width: 200px"
               clearable
               filterable
               placeholder="请选择"
+              style="width: 200px"
               @change="change"
             >
               <el-option
@@ -368,22 +396,27 @@
             </el-select>
           </el-form-item>
           <el-form-item label="销售单标识">
-            <el-input v-model="form.sale_id" style="width: 200px;" />
+            <el-input v-model="form.sale_id" style="width: 200px;"/>
           </el-form-item>
           <el-form-item label="是否搬运" prop="is_needmove">
             <el-select
               v-model="form.is_needmove"
               style="width: 200px"
             >
-              <el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option
+                v-for="item in trueorfalse"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
-          <el-form-item label="修改报工数" prop="is_canupdate_update">
+          <el-form-item :formatter="formatBoolean" label="修改报工数" prop="is_canupdate_update">
             <el-select
               v-model="form.is_canupdate_update"
               style="width: 200px"
             >
-              <el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
@@ -395,12 +428,16 @@
             >{{ item.label }}
             </el-radio>
           </el-form-item>
-          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
+          <el-form-item
+            v-if="form.workprocedure_id == '1535144822984282112'"
+            label="拆箱机"
+            prop="unboxing_device_code"
+          >
             <el-select
               v-model="form.package_ext.unboxing_device_code"
               style="width: 200px"
             >
-              <el-option v-for="item in cxj" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in cxj" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱输送正转" prop="is_foreward">
@@ -413,13 +450,18 @@
             </el-radio>
           </el-form-item>
 
-          <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" disabled label="装箱机" prop="ealing_device_code">
+          <el-form-item
+            v-if="form.workprocedure_id == '1535144822984282112'"
+            disabled
+            label="装箱机"
+            prop="ealing_device_code"
+          >
             <el-select
-              disabled
               v-model="form.package_ext.ealing_device_code"
+              disabled
               style="width: 200px"
             >
-              <el-option v-for="item in zxj" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in zxj" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机确认" prop="auto_confirm">
@@ -427,108 +469,111 @@
               v-model="form.package_ext.auto_confirm"
               style="width: 200px"
             >
-              <el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机确认时间" prop="time">
             <el-input-number
               v-model="form.package_ext.time"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="码盘数量" prop="tray_num">
             <el-input-number
               v-model="form.package_ext.tray_num"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
             <el-input-number
               v-model="form.package_ext.package_model"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总箱数" prop="demol_num">
             <el-input-number
               v-model="form.package_ext.demol_num"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
             <el-input-number
               v-model="form.package_ext.order_bag_num"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="每袋重量(g)" prop="one_bag_weight">
             <el-input-number
               v-model="form.package_ext.one_bag_weight"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
             <el-input-number
               v-model="form.package_ext.stack_model"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
-<!--三线工单参数-->
-          <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每箱袋数" prop="one_box_package_qty">
+          <!--三线工单参数-->
+          <el-form-item
+            v-if="form.workprocedure_id == '1689437952540807169'"
+            label="每箱袋数"
+            prop="one_box_package_qty"
+          >
             <el-input-number
               v-model="form.package_ext.one_box_package_qty"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总箱数" prop="box_num">
             <el-input-number
               v-model="form.package_ext.box_num"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每袋数量" prop="one_package_qty">
             <el-input-number
               v-model="form.package_ext.one_package_qty"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
               @change="A3_changepackage(form)"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总袋数" prop="package_qty">
             <el-input-number
               v-model="form.package_ext.package_qty"
-              style="width: 200px;"
               disabled
-
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="满托数量" prop="tray_full_num">
             <el-input-number
               v-model="form.package_ext.tray_full_num"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="箱型模版" prop="box_type">
             <el-input-number
               v-model="form.package_ext.box_type"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="目标巷道" prop="target_roadway">
             <el-input-number
               v-model="form.package_ext.target_roadway"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="是否翻转" prop="is_flip">
@@ -540,11 +585,15 @@
             >{{ item.label }}
             </el-radio>
           </el-form-item>
-          <el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="码垛模版号" prop="lane_tray_template">
+          <el-form-item
+            v-if="form.workprocedure_id == '1689437952540807169'"
+            label="码垛模版号"
+            prop="lane_tray_template"
+          >
             <el-input-number
               v-model="form.package_ext.lane_tray_template"
-              style="width: 200px;"
               clearable
+              style="width: 200px;"
             />
           </el-form-item>
         </el-form>
@@ -562,86 +611,106 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
-        <el-table-column prop="workorder_code" label="工单编号" width="100px">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column v-if="false" label="生产班次工单标识" prop="workorder_id"/>
+        <el-table-column label="工单编号" prop="workorder_code" width="100px">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="workorder_status" label="工单状态">
+        <el-table-column label="工单状态" prop="workorder_status">
           <template slot-scope="scope">
             {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
           </template>
         </el-table-column>
         <!--        <el-table-column prop="workprocedure_code" label="工序编码" />-->
-        <el-table-column prop="product_area" label="生产车间" />
-        <el-table-column prop="plan_qty" label="计划数量" />
-        <el-table-column prop="outupperlimit_qty" label="满筐数量" />
-        <el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
-        <el-table-column prop="real_qty" label="报工总数" />
-        <el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('materialCode',crud.data,'物料编码')" />
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
-        <el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')" />
+        <el-table-column label="生产车间" prop="product_area"/>
+        <el-table-column label="计划数量" prop="plan_qty"/>
+        <el-table-column label="满筐数量" prop="outupperlimit_qty"/>
+        <el-table-column label="电气实时数" prop="dq_real_qty" show-overflow-tooltip width="100"/>
+        <el-table-column label="报工总数" prop="real_qty"/>
+        <el-table-column
+          :min-width="flexWidth('material_code',crud.data,'物料编码')"
+          label="物料编码"
+          prop="material_code"
+        />
+        <el-table-column
+          :min-width="flexWidth('material_spec',crud.data,'物料规格')"
+          label="物料规格"
+          prop="material_spec"
+        />
+        <el-table-column
+          :min-width="flexWidth('device_code',crud.data,'当前设备编码')"
+          label="当前设备信息"
+          prop="device_code"
+        />
         <el-table-column
-          prop="workprocedure_name"
-          label="工序名称"
           :min-width="flexWidth('workprocedure_name',crud.data,'工序名称')"
+          label="工序名称"
+          prop="workprocedure_name"
         />
-        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
+        <el-table-column :formatter="crud.formatQlNum4" label="物料单重" prop="material_weight" width="100"/>
         <el-table-column
-          prop="planproducestart_date"
-          label="计划开始时间"
           :min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"
+          label="计划开始时间"
+          prop="planproducestart_date"
         />
         <el-table-column
-          prop="planproduceend_date"
-          label="计划结束时间"
           :min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"
+          label="计划结束时间"
+          prop="planproduceend_date"
         />
         <el-table-column
-          prop="realproducestart_date"
-          label="实际开始时间"
           :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"
+          label="实际开始时间"
+          prop="realproducestart_date"
         />
         <el-table-column
-          prop="realproduceend_date"
-          label="实际结束时间"
           :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"
+          label="实际结束时间"
+          prop="realproduceend_date"
         />
         <el-table-column
-          prop="is_canupdate_update"
-          label="允许修改报工数"
           :formatter="formatBoolean"
-          width="200"
+          label="允许修改报工数"
+          prop="is_canupdate_update"
           show-overflow-tooltip
+          width="200"
         />
-        <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
-        <el-table-column prop="shift_type_scode" label="班次类型">
+        <el-table-column :formatter="formatBoolean" label="是否搬运" prop="is_needmove"/>
+        <el-table-column label="班次类型" prop="shift_type_scode">
           <template slot-scope="scope">
             {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_type" label="创建类型" width="100">
+        <el-table-column label="创建类型" prop="create_type" width="100">
           <template slot-scope="scope">
             {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常" />
-        <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="workorder_id" label="工单id" width="160px" />
-        <el-table-column prop="nok_qty" label="报废总数" />
-        <el-table-column prop="report_qty" label="报修总数" />
-        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
-        <el-table-column prop="current_produce_person_name" label="操作工" show-overflow-tooltip />
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
-        <el-table-column prop="down_name" label="下发人" :min-width="flexWidth('down_name',crud.data,'下发人')" />
-        <el-table-column prop="down_time" label="下发时间" :min-width="flexWidth('down_time',crud.data,'下发时间')" />
-        <el-table-column prop="confirm_name" label="完工人" :min-width="flexWidth('confirm_name',crud.data,'完工人')" />
-        <el-table-column prop="confirm_time" label="完工时间" :min-width="flexWidth('confirm_time',crud.data,'完工时间')" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column :formatter="formatBoolean" label="是否异常" prop="is_error"/>
+        <el-table-column label="异常信息" prop="error_info" show-overflow-tooltip/>
+        <el-table-column label="备注" prop="remark"/>
+        <el-table-column label="工单id" prop="workorder_id" width="160px"/>
+        <el-table-column label="报废总数" prop="nok_qty"/>
+        <el-table-column label="报修总数" prop="repare_qty"/>
+        <el-table-column label="人员实际数量" prop="person_real_qty" show-overflow-tooltip width="100"/>
+        <el-table-column label="操作工" prop="current_produce_person_name" show-overflow-tooltip/>
+        <el-table-column :min-width="flexWidth('create_name',crud.data,'创建人')" label="创建人" prop="create_name"/>
+        <el-table-column
+          :min-width="flexWidth('create_time',crud.data,'创建时间')"
+          label="创建时间"
+          prop="create_time"
+        />
+        <el-table-column :min-width="flexWidth('down_name',crud.data,'下发人')" label="下发人" prop="down_name"/>
+        <el-table-column :min-width="flexWidth('down_time',crud.data,'下发时间')" label="下发时间" prop="down_time"/>
+        <el-table-column :min-width="flexWidth('confirm_name',crud.data,'完工人')" label="完工人" prop="confirm_name"/>
+        <el-table-column
+          :min-width="flexWidth('confirm_time',crud.data,'完工时间')"
+          label="完工时间"
+          prop="confirm_time"
+        />
+        <el-table-column v-permission="[]" align="center" fixed="right" label="操作" width="120px">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -651,7 +720,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
     <MaterDtl
       :dialog-show.sync="materialShow"
@@ -659,17 +728,17 @@
       :mater-opt-code="materType"
       @setMaterValue="setMaterValue"
     />
-    <ViewDialog ref="child3" />
-    <reportDialog ref="report" @AddChanged="querytable" />
-    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
-    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
-    <ReplaceDeviceDialog ref="child4" @AddChanged="querytable" />
+    <ViewDialog ref="child3"/>
+    <reportDialog ref="report" @AddChanged="querytable"/>
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3"/>
+    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable"/>
+    <ReplaceDeviceDialog ref="child4" @AddChanged="querytable"/>
   </div>
 </template>
 
 <script>
 import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -684,7 +753,6 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import AddDialog from '@/views/wms/product_manage/workorder/AddDialog'
 import UploadDialog from '@/views/wms/product_manage/workorder/UploadDialog'
 import ReplaceDeviceDialog from '@/views/wms/product_manage/workorder/ReplaceDeviceDialog'
-import { openStart } from './produceshiftorder'
 
 const defaultForm = {
   workorder_id: null,
@@ -697,7 +765,7 @@ const defaultForm = {
   person_real_qty: null,
   dq_real_qty: null,
   material_id: null,
-  materialCode: null,
+  material_code: null,
   material_weight: null,
   material_name: null,
   material_spec: null,
@@ -764,7 +832,10 @@ export default {
       workprocedureList: [],
       workprocedureListArea: [],
       zxj: [{ value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
-      auto_confirm: [{ value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
+      auto_confirm: [{ value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, {
+        value: '3',
+        label: '人工确认'
+      }],
       cxj: [{ value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_2', label: '一线2号拆箱机' }],
       trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
       deviceList: [],
@@ -793,7 +864,7 @@ export default {
         plan_qty: [
           { required: true, message: '计划数量不能为空', trigger: 'blur' }
         ],
-        materialCode: [
+        material_code: [
           { required: true, message: '物料编码不能为空', trigger: 'change' }
         ],
         order_status: [
@@ -817,31 +888,32 @@ export default {
   created() {
     this.getworkprocedure()
     this.initClass3()
+    this.getworkprocedureByarea(this.form.product_area)
   },
   methods: {
     databaseUploadApi() {
 
     },
-    changeEvent1(device){
-      if (device=='A1_BZJ_1'){
+    changeEvent1(device) {
+      if (device == 'A1_BZJ_1') {
         this.form.package_ext.ealing_device_code = 'A1_ZXJ_1'
       }
-      if (device=='A1_BZJ_2'){
+      if (device == 'A1_BZJ_2') {
         this.form.package_ext.ealing_device_code = 'A1_ZXJ_2'
       }
     },
-    changeEvent2(form){
-      if ((form.device_code=='A1_BZJ_1') && (form.package_ext.unboxing_device_code == 'A1_KXJ_1')){
+    changeEvent2(form) {
+      if ((form.device_code == 'A1_BZJ_1') && (form.package_ext.unboxing_device_code == 'A1_KXJ_1')) {
         this.form.package_ext.is_foreward = '1'
       }
-      if ((form.device_code=='A1_BZJ_2') && (form.package_ext.unboxing_device_code == 'A1_KXJ_2')){
+      if ((form.device_code == 'A1_BZJ_2') && (form.package_ext.unboxing_device_code == 'A1_KXJ_2')) {
         this.form.package_ext.is_foreward = '1'
       }
       this.form.package_ext.is_foreward = '0'
     },
-    A3_changepackage(form){
-      if (form.package_ext.one_package_qty !=null && form.package_ext.one_package_qty>0){
-        form.package_ext.package_qty = parseFloat(form.plan_qty/form.package_ext.one_package_qty).toFixed(0)
+    A3_changepackage(form) {
+      if (form.package_ext.one_package_qty != null && form.package_ext.one_package_qty > 0) {
+        form.package_ext.package_qty = parseFloat(form.plan_qty / form.package_ext.one_package_qty).toFixed(0)
       }
     },
     formatBoolean: function(row, column) {
@@ -1054,8 +1126,9 @@ export default {
     },
     // 新增编辑给form表单物料相关信息赋值
     setMaterValue(row) {
+      debugger
       this.form.material_id = row.material_id
-      this.form.materialCode = row.material_code
+      this.form.material_code = row.material_code
       this.form.material_name = row.material_name
       this.form.material_spec = row.material_spec
     },

mes/qd/src/views/wms/pub/rawMaterDialog.vue

@@ -0,0 +1,211 @@
+<template>
+  <el-dialog
+    title="物料选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <!-- <el-form-item label="物料类别">
+        <treeselect
+          v-model="query.material_type_id"
+          :load-options="loadClass"
+          :options="classes"
+          style="width: 200px;"
+          placeholder="选择物料类别"
+        />
+      </el-form-item> -->
+      <el-form-item label="模糊搜索">
+        <el-input
+          v-model="query.search"
+          clearable
+          size="mini"
+          placeholder="编码、名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
+      <el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="规格" show-overflow-tooltip />
+      <el-table-column prop="material_model" label="型号" />
+      <el-table-column prop="class_code" label="分类编码" />
+      <el-table-column prop="class_name" label="物料分类" />
+      <el-table-column
+        show-overflow-tooltip
+        min-width="100"
+        prop="product_series_name"
+        label="系列"
+      />
+      <el-table-column prop="unit_name" label="计量单位" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+
+export default {
+  name: 'MaterDtl',
+  components: { rrOperation, pagination, Treeselect },
+  cruds() {
+    return CRUD({ title: '物料', url: 'api/Materialbase', crudMethod: { ...crudMaterialbase }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    materOptCode: {
+      type: String,
+      default: '00'
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    seriesFormat(row) {
+      return this.dict.label.product_series[row.product_series]
+    },
+    open() {
+   this.query.optCode ='10'
+   this.crud.toQuery()
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    handleSelectionChange(val, row) {
+      if (this.isSingle) {
+        if (val.length > 1) {
+          this.$refs.table.clearSelection()
+          this.$refs.table.toggleRowSelection(val.pop())
+        } else {
+          this.checkrow = row
+        }
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('setMaterValue', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('setMaterValue', this.rows)
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+