Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue

@@ -26,6 +26,25 @@
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+      </el-form-item>
+      <el-form-item label="业务类型" prop="bill_type">
+        <el-select
+          v-model="form.bill_type"
+          clearable
+          size="mini"
+          placeholder="业务类型"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in dict.ST_INV_IN_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="仓库" prop="stor_id">
         <label slot="label">仓库</label>
         <el-select
@@ -43,22 +62,28 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="业务类型" prop="bill_type">
+      <el-form-item label="车间" prop="workshop_id">
+        <label slot="label">车间</label>
         <el-select
-          v-model="form.bill_type"
+          v-model="form.workshop_id"
           clearable
           size="mini"
-          placeholder="业务类型3"
+          placeholder="全部"
           class="filter-item"
+          @change="crud.toQuery"
         >
           <el-option
-            v-for="item in dict.ST_INV_IN_TYPE"
+            v-for="item in dict.product_area"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="仓位" prop="struct_id">
+        <label slot="label">仓位:</label>
+        <el-input v-model="form.struct_id" size="mini" disabled style="width: 210px" />
+      </el-form-item>
       <el-form-item label="单据状态" prop="bill_status">
         <el-select
           v-model="form.bill_status"
@@ -91,9 +116,6 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <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" />
@@ -214,6 +236,8 @@ const defaultForm = {
   detail_count: '0',
   bill_type: '',
   remark: '',
+  workshop_id: '',
+  stor_id: '',
   biz_date: new Date(),
   create_mode: '',
   tableData: []

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue

@@ -12,44 +12,33 @@
   >
     <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 icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary"
+                     @click="crud.submitCU">保存</el-button>
           <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
         </span>
       </el-col>
     </el-row>
 
-    <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=":">
+    <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=":">
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
       </el-form-item>
-      <el-form-item label="仓库" prop="product_code">
-        <label slot="label">生产车间:</label>
-        <el-select
-          v-model="form.product_code"
-          clearable
-          class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
-        >
-          <el-option
-            v-for="item in dict.product_area"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
+                        value-format="yyyy-MM-dd" :disabled="crud.status.view > 0"/>
       </el-form-item>
-      <el-form-item label="业务类型">
+      <el-form-item label="业务类型" prop="bill_type">
         <el-select
           v-model="form.bill_type"
           clearable
           size="mini"
-          placeholder="业务类型3"
+          placeholder="业务类型"
           class="filter-item"
         >
           <el-option
@@ -60,6 +49,52 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓库</label>
+        <el-select
+          v-model="form.stor_id"
+          clearable
+          class="filter-item"
+          @change="storChange"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
+          />
+        </el-select>
+      </el-form-item>
+      <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"
+        >
+          <el-option
+            v-for="item in dict.product_area"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓位" prop="struct_id">
+        <label slot="label">仓位:</label>
+        <el-cascader
+          v-model="form.struct_id"
+          placeholder="请选择"
+          :options="sects"
+          :props="{ checkStrictly: true }"
+          clearable
+          @change="sectQueryChange"
+        />
+      </el-form-item>
       <el-form-item label="单据状态" prop="bill_status">
         <el-select
           v-model="form.bill_status"
@@ -79,7 +114,7 @@
       </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" size="mini" disabled style="width: 210px"/>
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -92,12 +127,10 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <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" />
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"
+                  :disabled="crud.status.view > 0"/>
       </el-form-item>
     </el-form>
 
@@ -105,7 +138,7 @@
     <div class="crud-opts2" style="margin-bottom: 5px;">
       <span class="crud-opts-right2">
         <!--左侧插槽-->
-        <slot name="left" />
+        <slot name="left"/>
         <el-button
           slot="left"
           class="filter-item"
@@ -127,23 +160,11 @@
       border
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center"/>
 
-      <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="material_spec" label="物料规格" />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号">
-        <template slot-scope="scope">
-          <el-input
-            v-model="form.tableData[scope.$index].pcsn"
-            clearable
-            :controls="false"
-            controls-position="right"
-            size="small"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
+      <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="plan_qty" label="入库重量">
         <template slot-scope="scope">
           <el-input-number
             v-model="form.tableData[scope.$index].plan_qty"
@@ -156,6 +177,21 @@
           />
         </template>
       </el-table-column>
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位"/>
+      <el-table-column show-overflow-tooltip prop="remark" label="明细备注">
+        <template slot-scope="scope">
+          <el-input
+            v-model="form.tableData[scope.$index].remark"
+            size="small"
+            :controls="false"
+            controls-position="right"
+            @change="changeQty"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型"/>
+      <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号"/>
+      <el-table-column show-overflow-tooltip prop="supp_name" label="供应商"/>
       <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
           <el-button
@@ -180,9 +216,11 @@
 </template>
 
 <script>
-import CRUD, { crud, form } from '@crud/crud'
-import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import CRUD, {crud, form} from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
+import crudStorattr from "@/api/wms/basedata/st/storattr";
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import crudStructattr from "@/api/wms/basedata/st/structattr";
 
 const defaultForm = {
   bill_code: '',
@@ -190,6 +228,8 @@ const defaultForm = {
   bill_status: '10',
   total_qty: '0',
   detail_count: '0',
+  stor_id: '',
+  struct_id: '',
   bill_type: '',
   remark: '',
   biz_date: new Date(),
@@ -199,7 +239,7 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: { MaterDtl },
+  components: {MaterDtl},
   mixins: [crud(), form(defaultForm)],
   dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
   props: {
@@ -216,19 +256,22 @@ export default {
       dialogVisible: false,
       materShow: false,
       dtlShow: false,
+      struct_id: '',
+      sect_id: '',
       opendtlParam: null,
       materType: '03', // 关键成品
       storlist: [],
+      sects: [],
       billtypelist: [],
       rules: {
         product_code: [
-          { required: true, message: '生产车间不能为空', trigger: 'blur' }
+          {required: true, message: '生产车间不能为空', trigger: 'blur'}
         ],
         bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+          {required: true, message: '业务类型不能为空', trigger: 'blur'}
         ],
         biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+          {required: true, message: '业务日期不能为空', trigger: 'blur'}
         ]
       }
     }
@@ -242,8 +285,8 @@ export default {
   },
   methods: {
     open() {
-      crudProductIn.queryStor().then(res => {
-        this.storlist = res
+      crudStorattr.queryStor({"stor_type": "3"}).then(res => {
+        this.storlist = res.content
       })
     },
     close() {
@@ -251,7 +294,7 @@ export default {
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -260,8 +303,16 @@ export default {
         }
       })
     },
+    [CRUD.HOOK.beforeToEdit]() {
+      this.struct_id = this.crud.form.struct_id
+      this.sect_id = this.crud.form.sect_id
+      crudStructattr.getSectCascader({'stor_id': this.crud.form.stor_id}).then(res => {
+        this.sects = res.content
+        this.form.struct_id = this.search(this.sects, this.struct_id)
+      })
+    },
     [CRUD.HOOK.afterToView]() {
-      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudProductIn.getIODtl({'bill_code': this.form.bill_code}).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -278,13 +329,60 @@ export default {
         return false
       }
 
+      if (!this.form.stor_id) {
+        this.crud.notify('仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+
+      if (!this.struct_id) {
+        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.pcsn || !row.plan_qty) {
-          this.crud.notify('订单号、数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+        if (!row.plan_qty) {
+          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]
+        row.sect_id = this.sect_id
+        row.struct_id = this.struct_id
+      }
+    },
+    storChange(value) {
+      crudStructattr.getSectCascader({'stor_id': value}).then(res => {
+        this.sects = res.content
+      })
+    },
+    search(object, value) {
+      debugger
+      for (var key in object) {
+        if (object[key].value == value) return [object[key].value];
+        if (object[key].children && Object.keys(object[key].children).length > 0) {
+          var temp = search(object[key].children, value);
+          if (temp) return [object[key].value, temp].flat();
+        }
+      }
+    },
+    sectQueryChange(val) {
+      debugger
+      this.sectProp = val
+      if (val.length === 1) {
+        this.sect_id = val[0]
+        this.struct_id = ''
+      }
+      if (val.length === 0) {
+        this.sect_id = ''
+        this.struct_id = ''
+      }
+      if (val.length === 2) {
+        this.sect_id = val[0]
+        this.struct_id = val[1]
+      }
     },
     deleteRow(index, rows) {
       const material_code = rows[index].material_code
@@ -304,6 +402,7 @@ export default {
     tableChanged(rows) {
       // 对新增的行进行校验不能存在相同物料批次
       rows.forEach((item) => {
+        debugger
         let same_mater = true
         this.form.tableData.forEach((row) => {
           if (row.material_code === item.material_code) {
@@ -315,6 +414,8 @@ export default {
           item.ivt_level = '01'
           item.is_active = '1'
           item.plan_qty = '1'
+          item.qty_unit_id = item.base_unit_id
+          item.qty_unit_name = item.base_unit_name
           this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
           this.form.tableData.splice(-1, 0, item)
         }

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue

@@ -201,14 +201,13 @@
 
 <script>
 import CRUD, { crud } from '@crud/crud'
-import StructDiv from '@/views/wms/pub/StructDialog'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
 import crudPoint from '@/api/wms/sch/point'
 import crudRegion from '@/api/wms/sch/region'
 
 export default {
   name: 'DivDialog',
-  components: { StructDiv },
+  components: {},
   mixins: [crud()],
   dicts: ['IO_BILL_STATUS', 'MD_OVERSTRUCT_TYPE'],
   props: {

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog.vue

@@ -9,10 +9,11 @@
     @close="close"
     @open="open"
   >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
+             :model="form" size="mini" label-width="85px" label-suffix=":">
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
       </el-form-item>
       <el-form-item label="生产车间">
         <el-select
@@ -70,7 +71,7 @@
       </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" size="mini" disabled style="width: 210px"/>
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -84,11 +85,12 @@
         />
       </el-form-item>
       <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
+                        value-format="yyyy-MM-dd" :disabled="true"/>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <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="true" />
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true"/>
       </el-form-item>
     </el-form>
     <div class="crud-opts2">
@@ -107,41 +109,13 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @current-change="handleDtlCurrentChange"
       >
-        <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column prop="pcsn" label="订单号" width="150" align="center" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column prop="qty_unit_name" label="单位" align="center" />
-        <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
-      </el-table>
-    </el-card>
-    <div class="crud-opts2">
-      <span class="role-span">作业明细</span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
-      <!--表格渲染-->
-      <el-table
-        ref="table2"
-        :data="tabledis"
-        style="width: 100%;"
-        max-height="300"
-        size="mini"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDisCurrentChange"
-      >
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column prop="pcsn" label="订单号" align="center" width="150" />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column prop="point_code1" label="起始位置" align="center" />
-        <el-table-column prop="point_code2" label="目的位置" align="center" />
-        <el-table-column prop="task_code" label="任务号" align="center" />
-        <el-table-column prop="task_type_name" label="任务类型" align="center" width="150px" />
+        <el-table-column type="index" label="序号" width="55" align="center"/>
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center"/>
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center"/>
+        <el-table-column prop="pcsn" label="订单号" width="150" align="center"/>
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center"/>
+        <el-table-column prop="qty_unit_name" label="单位" align="center"/>
+        <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center"/>
       </el-table>
     </el-card>
   </el-dialog>
@@ -149,12 +123,12 @@
 
 <script>
 
-import { crud } from '@crud/crud'
+import {crud} from '@crud/crud'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
 
 export default {
   name: 'ViewDialog',
-  components: { },
+  components: {},
   mixins: [crud()],
   dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
   props: {
@@ -235,13 +209,13 @@ export default {
       this.currentDis = current
     },
     queryTableDtl() {
-      crudProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
         this.tableDtl = res
       })
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        crudProductIn.getDisTask({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []
@@ -262,13 +236,14 @@ export default {
 
 .crud-opts2 .el-dialog__title2 {
   line-height: 24px;
-  font-size:20px;
-  color:#303133;
+  font-size: 20px;
+  color: #303133;
 }
 
 .crud-opts2 .role-span2 {
   padding: 0px 0px 20px 0px;
 }
+
 .crud-opts2 {
   padding: 10px 0px 0px 50px;
 }

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue

@@ -23,10 +23,10 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.IO_BILL_STATUS"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
               />
             </el-select>
           </el-form-item>
@@ -52,7 +52,7 @@
 
           <el-form-item label="生成方式">
             <el-select
-              v-model="query.bill_type"
+              v-model="query.create_mode"
               clearable
               filterable
               size="mini"
@@ -61,7 +61,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_IN_TYPE"
+                v-for="item in dict.ST_INV_CREATE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -127,7 +127,7 @@
             </el-select>
           </el-form-item>
 
-          <rrOperation />
+          <rrOperation/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -157,31 +157,32 @@
         @select="handleSelectionChange"
         @select-all="onSelectAll"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="55"/>
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态"/>
         <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
-        <el-table-column prop="product_name" label="生产车间" width="130" show-overflow-tooltip />
-        <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
-        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
-        <el-table-column label="明细数" align="center" prop="detail_count" />
+        <el-table-column prop="stor_name" label="生产车间" width="130" show-overflow-tooltip/>
+        <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型"
+                         :formatter="bill_typeFormat"/>
+        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期"/>
+        <el-table-column label="明细数量" align="center" prop="detail_count"/>
         <el-table-column label="总重量" align="center" prop="total_qty">
           <template slot-scope="scope">
             {{ fun(scope.row.total_qty) }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="制单人" align="center" prop="create_name" />
-        <el-table-column label="制单时间" align="center" prop="create_time" width="150" />
-        <el-table-column label="修改人" align="center" prop="update_name" />
-        <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
-        <el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
-        <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
-        <el-table-column label="确认人" align="center" prop="confirm_name" width="150" />
-        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
+        <el-table-column label="备注" align="center" prop="remark"/>
+        <el-table-column label="制单人" align="center" prop="create_name"/>
+        <el-table-column label="制单时间" align="center" prop="create_time" width="150"/>
+        <el-table-column label="修改人" align="center" prop="update_name"/>
+        <el-table-column label="修改时间" align="center" prop="update_time" width="150"/>
+        <el-table-column label="分配人" align="center" prop="dis_name" width="140px"/>
+        <el-table-column label="分配时间" align="center" prop="dis_time" width="150"/>
+        <el-table-column label="确认人" align="center" prop="confirm_name" width="150"/>
+        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150"/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -194,18 +195,18 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <AddDialog @AddChanged="querytable" />
-    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
-    <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable" />
+    <AddDialog @AddChanged="querytable"/>
+    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable"/>
+    <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable"/>
   </div>
 </template>
 
 <script>
-import productIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import rawProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
-import CRUD, { crud, header, presenter } from '@crud/crud'
+import CRUD, {crud, header, presenter} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -214,23 +215,25 @@ import DateRangePicker from '@/components/DateRangePicker/index'
 import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog'
 import DivDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog'
 import ViewDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog'
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
+import crudStorattr from "@/api/wms/basedata/st/storattr";
 
 export default {
   name: 'RawProductIn',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
+  components: {ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog},
   cruds() {
     return CRUD({
       title: '',
-      optShow: { add: true, reset: true },
+      optShow: {add: true, reset: true},
       idField: 'iostorinv_id',
-      url: '/api/in/productIn',
-      crudMethod: { ...productIn }
+      url: '/api/stIvtIostorinvYl',
+      sort: ['bill_code,desc'],
+      crudMethod: {...rawProductIn}
     })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area'],
+  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area', 'ST_INV_CREATE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -252,15 +255,15 @@ export default {
       'user'
     ])
   },
-  mounted: function() {
+  mounted: function () {
     const that = this
     window.onresize = function temp() {
       that.height = document.documentElement.clientHeight - 180 + 'px;'
     }
   },
   created() {
-    crudProductIn.queryStor().then(res => {
-      this.storlist = res
+    crudStorattr.queryStor({"stor_type": "3"}).then(res => {
+      this.storlist = res.content
     })
   },
   methods: {
@@ -328,7 +331,7 @@ export default {
       return this.dict.label.IO_BILL_STATUS[row.bill_status]
     },
     divOpen() {
-      crudProductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
+      crudProductIn.getIODtl({'bill_code': this.currentRow.bill_code, 'open_flag': '1'}).then(res => {
         this.openParam = res
         debugger
         this.storId = this.currentRow.product_code

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: '/api/in/productIn',
+    url: '/api/stIvtIostorinvYl',
     method: 'post',
     data
   })
@@ -10,23 +10,23 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: '/api/in/productIn',
-    method: 'delete',
+    url: '/api/stIvtIostorinvYl/delete',
+    method: 'post',
     data: ids
   })
 }
 
 export function edit(data) {
   return request({
-    url: '/api/in/productIn',
-    method: 'put',
+    url: '/api/stIvtIostorinvYl/update',
+    method: 'post',
     data
   })
 }
 
 export function getType(params) {
   return request({
-    url: '/api/in/productIn/getType',
+    url: '/api/stIvtIostorinvYl/getType',
     method: 'get',
     params
   })
@@ -34,7 +34,7 @@ export function getType(params) {
 
 export function getIODtl(data) {
   return request({
-    url: '/api/in/productIn/getIODtl',
+    url: '/api/stIvtIostorinvYl/getIODtl',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function getIODtl(data) {
 
 export function insertDtl(data) {
   return request({
-    url: '/api/in/productIn/insertDtl',
+    url: '/api/stIvtIostorinvYl/insertDtl',
     method: 'post',
     data
   })
@@ -50,7 +50,7 @@ export function insertDtl(data) {
 
 export function commit(data) {
   return request({
-    url: '/api/in/productIn/commit',
+    url: '/api/stIvtIostorinvYl/commit',
     method: 'post',
     data
   })
@@ -58,7 +58,7 @@ export function commit(data) {
 
 export function checkVehicle(data) {
   return request({
-    url: '/api/in/productIn/checkVehicle',
+    url: '/api/stIvtIostorinvYl/checkVehicle',
     method: 'post',
     data
   })
@@ -66,7 +66,7 @@ export function checkVehicle(data) {
 
 export function confirmvehicle(data) {
   return request({
-    url: '/api/in/productIn/confirmvehicle',
+    url: '/api/stIvtIostorinvYl/confirmvehicle',
     method: 'post',
     data
   })
@@ -74,7 +74,7 @@ export function confirmvehicle(data) {
 
 export function getDisDtl(data) {
   return request({
-    url: '/api/in/productIn/getDisDtl',
+    url: '/api/stIvtIostorinvYl/getDisDtl',
     method: 'post',
     data
   })
@@ -82,7 +82,7 @@ export function getDisDtl(data) {
 
 export function divStruct(data) {
   return request({
-    url: '/api/in/productIn/divStruct',
+    url: '/api/stIvtIostorinvYl/divStruct',
     method: 'post',
     data
   })
@@ -90,7 +90,7 @@ export function divStruct(data) {
 
 export function unDivStruct(data) {
   return request({
-    url: '/api/in/productIn/unDivStruct',
+    url: '/api/stIvtIostorinvYl/unDivStruct',
     method: 'post',
     data
   })
@@ -98,7 +98,7 @@ export function unDivStruct(data) {
 
 export function divPoint(data) {
   return request({
-    url: '/api/in/productIn/divPoint',
+    url: '/api/stIvtIostorinvYl/divPoint',
     method: 'post',
     data
   })
@@ -106,7 +106,7 @@ export function divPoint(data) {
 
 export function bucketDtl(data) {
   return request({
-    url: '/api/in/productIn/bucketDtl',
+    url: '/api/stIvtIostorinvYl/bucketDtl',
     method: 'post',
     data
   })
@@ -114,7 +114,7 @@ export function bucketDtl(data) {
 
 export function updateTask(data) {
   return request({
-    url: '/api/in/productIn/updateTask',
+    url: '/api/stIvtIostorinvYl/updateTask',
     method: 'post',
     data
   })
@@ -122,7 +122,7 @@ export function updateTask(data) {
 
 export function confirmTask(data) {
   return request({
-    url: '/api/in/productIn/confirmTask',
+    url: '/api/stIvtIostorinvYl/confirmTask',
     method: 'post',
     data
   })
@@ -130,7 +130,7 @@ export function confirmTask(data) {
 
 export function confirm(data) {
   return request({
-    url: '/api/in/productIn/confirm',
+    url: '/api/stIvtIostorinvYl/confirm',
     method: 'post',
     data
   })
@@ -138,7 +138,7 @@ export function confirm(data) {
 
 export function delDis(data) {
   return request({
-    url: '/api/in/productIn/delDis',
+    url: '/api/stIvtIostorinvYl/delDis',
     method: 'post',
     data
   })
@@ -146,7 +146,7 @@ export function delDis(data) {
 
 export function queryBoxMater(data) {
   return request({
-    url: '/api/in/productIn/queryBoxMater',
+    url: '/api/stIvtIostorinvYl/queryBoxMater',
     method: 'post',
     data
   })
@@ -154,14 +154,14 @@ export function queryBoxMater(data) {
 
 export function queryStor() {
   return request({
-    url: '/api/in/productIn/queryStor',
+    url: '/api/stIvtIostorinvYl/queryStor',
     method: 'post'
   })
 }
 
 export function getDisTask(data) {
   return request({
-    url: '/api/in/productIn/getDisTask',
+    url: '/api/stIvtIostorinvYl/getDisTask',
     method: 'post',
     data
   })

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue

@@ -15,11 +15,11 @@
       </el-form-item>
       <el-form-item label="所属仓库" prop="stor_name">
         <label slot="label">所属仓库:</label>
-        <el-input v-model="form.stor_name" disabled  clearable style="width: 210px" />
+        <el-input v-model="form.stor_name" disabled clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="入库点" prop="point_code">
         <label slot="label">入库点:</label>
-        <el-input v-model="form.point_code" disabled  clearable style="width: 210px" />
+        <el-input v-model="form.point_code" disabled clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="生产车间">
         <el-select

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue

@@ -147,7 +147,7 @@
           type="warning"
           icon="el-icon-check"
           size="mini"
-          :disabled= dis_flag
+          :disabled="dis_flag"
           @click="confirm"
         >
           强制确认
@@ -220,7 +220,7 @@ import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/Vie
 import { mapGetters } from 'vuex'
 
 export default {
-  name: 'semiproductIn',
+  name: 'SemiproductIn',
   components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
     return CRUD({
@@ -292,7 +292,7 @@ export default {
     buttonChange(currentRow) {
       if (currentRow !== null) {
         this.currentRow = currentRow
-        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' ) {
+        if (currentRow.bill_status === '10' || currentRow.bill_status === '20') {
           this.confirm_flag = false
         } else {
           this.confirm_flag = true

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog.vue

@@ -1,385 +0,0 @@
-<template>
-  <el-dialog
-    title="出库单编辑"
-    append-to-body
-    fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
-    @open="open"
-    @close="close"
-  >
-    <el-row v-show="crud.status.cu > 0" :gutter="20">
-      <el-col :span="20" style="border: 1px solid white">
-        <span />
-      </el-col>
-      <el-col :span="4">
-        <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
-        </span>
-      </el-col>
-    </el-row>
-
-    <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=":">
-      <el-form-item label="单据号" prop="bill_code">
-        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="生产车间" prop="product_code">
-        <label slot="label">生产车间:</label>
-        <el-select
-          v-model="form.product_code"
-          clearable
-          placeholder="生产车间"
-          class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
-          @change="storChange"
-        >
-          <el-option
-            v-for="item in dict.product_area"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="业务类型" prop="bill_type">
-        <el-select
-          v-model="form.bill_type"
-          clearable
-          filterable
-          size="mini"
-          placeholder="业务类型"
-          class="filter-item"
-        >
-          <el-option
-            v-for="item in dict.bill_type"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="单据状态" prop="bill_status">
-        <el-select
-          v-model="form.bill_status"
-          clearable
-          style="width: 210px"
-          placeholder="单据状态"
-          class="filter-item"
-          disabled
-        >
-          <el-option
-            v-for="item in dict.IO_BILL_STATUS"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </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>
-      <el-form-item label="总重量" prop="total_qty">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
-        <el-input-number
-          v-model="form.total_qty"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <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" />
-      </el-form-item>
-    </el-form>
-
-    <div class="crud-opts2">
-      <span class="role-span">出库明细</span>
-      <span v-if="crud.status.cu > 0" class="crud-opts-right2">
-
-        <!--左侧插槽-->
-        <slot name="left" />
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="queryDtl()"
-        >
-          添加物料
-        </el-button>
-        <!--   <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="insertdtl()"
-        >
-          新增一行
-        </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="50" align="center" />
-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
-        <!-- <template scope="scope">
-          <el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
-            <el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
-          </el-input>
-          <span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
-        </template>-->
-      </el-table-column>
-      <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="物料规格" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" width="150px" align="center">
-        <!--   <template scope="scope">
-          <el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
-          <span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
-        </template>-->
-      </el-table-column>
-      <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
-        <template scope="scope">
-          <el-input-number v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
-          <!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
-        </template>
-      </el-table-column>
-      <el-table-column prop="qty_unit_name" label="单位" align="center" />
-      <!--   <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
-        <template scope="scope">
-          <el-input v-model="scope.row.remark" size="mini" />
-          <span>{{ scope.row.remark }}</span>
-        </template>
-      </el-table-column>-->
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" 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>
-
-    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged5" />
-    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
-  </el-dialog>
-</template>
-
-<script>
-import CRUD, { crud, form } from '@crud/crud'
-import AddDtl from '@/views/wms/storage_manage/semiproduct/semiproductOut/AddDtl'
-import MaterDialog from '@/views/wms/pub/MaterDialog'
-import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-const defaultForm = {
-  bill_code: '',
-  stor_id: '',
-  stor_code: '',
-  stor_name: '',
-  bill_status: '10',
-  total_qty: '0',
-  detail_count: '0',
-  bill_type: '',
-  remark: '',
-  biz_date: new Date(),
-  out_stor_id: '',
-  create_mode: '',
-  tableData: []
-}
-export default {
-  name: 'AddDialog',
-  components: { AddDtl, MaterDialog },
-  mixins: [crud(), form(defaultForm)],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    }
-  },
-  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
-  data() {
-    return {
-      dialogVisible: false,
-      dtlShow: false,
-      materType: '',
-      materShow: false,
-      flagnow: false,
-      nowrow: {},
-      nowindex: '',
-      storlist: [],
-      inStorList: [],
-      invtypelist: [],
-      storId: null,
-      rules: {
-        product_code: [
-          { required: true, message: '生产车间不能为空', trigger: 'blur' }
-        ],
-        bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
-        ],
-        biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    open() {
-      crudsemiproductIn.queryStor().then(res => {
-        this.storlist = res
-      })
-    },
-    close() {
-      this.$emit('AddChanged')
-    },
-    [CRUD.HOOK.beforeSubmit]() {
-      if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-    },
-    [CRUD.HOOK.afterToEdit]() {
-      semisemiproductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        /*   for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          row.edit = false
-          this.form.tableData.splice(i, 1, row)
-        }*/
-      })
-    },
-    [CRUD.HOOK.afterToView]() {
-      semisemiproductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          row.edit = true
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
-    },
-    invtypeFormat(row, column) {
-      return this.dict.label.bill_type[row.source_bill_type]
-    },
-    storChange(row) {
-      this.storlist.forEach((item) => {
-        if (item.product_code === row) {
-          this.form.product_code = item.product_code
-        }
-      })
-    },
-    async queryMater(index, row) {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.materShow = true
-      this.nowindex = index
-      this.nowrow = row
-    },
-    queryDtl(index, row) {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.form.product_code === '') {
-        this.crud.notify('请选择生产车间！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.storId = this.form.product_code
-      this.dtlShow = true
-    },
-    tableChanged5(rows) {
-      rows.forEach((item) => {
-        debugger
-        if (this.form.tableData.length !== 0) {
-          this.flagnow = false
-          for (let i = 0; i < this.form.tableData.length; i++) {
-            if (this.form.tableData[i].material_id === item.material_id && this.form.tableData[i].pcsn === item.pcsn) {
-              this.flagnow = true
-            }
-          }
-          if (!this.flagnow) {
-            item.edit = true
-            this.form.tableData.splice(-1, 0, item)
-            this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
-          }
-        } else {
-          item.edit = true
-          this.form.tableData.splice(-1, 0, item)
-          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
-        }
-      })
-      this.form.detail_count = this.form.tableData.length
-    },
-    setMaterValue(row) {
-      for (let i = 0; i < this.form.tableData.length; i++) {
-        if (this.form.tableData[i].material_id === row.material_id) {
-          this.crud.notify('不允许添加相同物料！')
-          return false
-        }
-      }
-      this.nowrow.material_id = row.material_id
-      this.nowrow.material_code = row.material_code
-      this.nowrow.material_name = row.material_name
-      this.nowrow.qty_unit_id = row.base_unit_id
-      this.nowrow.qty_unit_name = row.unit_name
-      this.nowrow.plan_qty = '1'
-      this.nowrow.edit = false
-      this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
-    },
-    async insertdtl() {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.form.tableData.push({ material_id: '', material_code: '', material_name: '', pcsn: '', quality_scode: '00', plan_qty: '1', qty_unit_name: '', qty_unit_id: '', remark: '', edit: false })
-      this.form.detail_count = this.form.tableData.length
-    },
-    deleteRow(index, rows) {
-      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
-      rows.splice(index, 1)
-    }
-  }
-}
-</script>
-
-<style>
-.crud-opts2 {
-  padding: 0 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-  padding: 4px 4px;
-}
-.input-with-select  {
-  background-color: #fff;
-}
-</style>

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDtl.vue

@@ -1,163 +0,0 @@
-<template>
-  <el-dialog
-    title="物料选择"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    :show-close="false"
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <div class="head-container">
-      <div>
-        <!-- 搜索 -->
-        <el-input
-          v-model="query.material_code"
-          clearable
-          size="mini"
-          placeholder="物料编码、名称"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.material_spec"
-          clearable
-          size="mini"
-          placeholder="物料规格"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.pcsn"
-          clearable
-          size="mini"
-          placeholder="订单号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
-      </div>
-    </div>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
-      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
-      <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_name',crud.data,'物料规格')" />
-      <el-table-column prop="struct_code" label="点位" :min-width="flexWidth('struct_name',crud.data,'点位')" />
-      <el-table-column prop="pcsn" label="订单号" :min-width="flexWidth('pcsn',crud.data,'订单号')" />
-      <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="可用数" />
-      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
-      <el-button slot="left" type="primary" @click="submit">保存</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-
-export default {
-  name: 'AddDtl',
-  components: { rrOperation, pagination },
-  cruds() {
-    return CRUD({
-      title: '用户', url: 'api/productOut/addDtl',
-      optShow: {
-        add: false,
-        edit: false,
-        del: false,
-        reset: true,
-        download: false
-      },
-      query: {
-
-      }
-    })
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    openParam: {
-      type: String
-    },
-    storId: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      opendtlParam: '',
-      rows: [],
-      openShow: true
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    },
-    openParam: {
-      handler(newValue, oldValue) {
-        this.opendtlParam = newValue
-      }
-    }
-  },
-  methods: {
-    [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.mater_type = this.opendtlParam
-      this.crud.query.stor_id = this.storId
-      if (this.openShow) {
-        this.openShow = false
-        return false
-      } else {
-        return true
-      }
-    },
-    close() {
-      this.crud.resetQuery(false)
-      // 清空grid数据
-      this.crud.data = undefined
-      this.$emit('update:dialogShow', false)
-    },
-    open() {
-      this.crud.query.mater_type = this.opendtlParam
-    },
-    submit() {
-      this.rows = this.$refs.multipleTable.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
-    }
-  }
-}
-</script>
-

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog.vue

@@ -1,580 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    :show-close="false"
-    fullscreen
-    @close="close"
-    @open="open"
-  >
-
-    <span slot="title" class="dialog-footer">
-      <div class="crud-opts2">
-        <span class="el-dialog__title2">出库分配</span>
-        <span class="crud-opts-right2">
-          <!--左侧插槽-->
-          <slot name="left" />
-          <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
-        </span>
-      </div>
-    </span>
-    <div class="crud-opts2">
-      <span class="role-span">出库明细</span>
-      <div class="crud-opts-form">
-        <el-form ref="form" :inline="true" :model="form" size="mini">
-          <el-form-item label="生产车间" prop="gender2">
-            <el-cascader
-              placeholder="请选择"
-              :options="sects"
-              :props="{ checkStrictly: true }"
-              clearable
-              @change="sectQueryChange"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-        <el-button
-          slot="left"
-          class="filter-item"
-          :loading="loadingAlldiv"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="allDiv()"
-        >
-          全部分配
-        </el-button>
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="allCancel()"
-        >
-          全部取消
-        </el-button>
-        <el-button
-          slot="left"
-          class="filter-item"
-          :loading="loadingAutodiv"
-          type="primary"
-          icon="el-icon-check"
-          size="mini"
-          :disabled="button1"
-          @click="oneDiv()"
-        >
-          自动分配
-        </el-button>
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-check"
-          size="mini"
-          :disabled="button2"
-          @click="oneCancel()"
-        >
-          自动取消
-        </el-button>
-        <!-- <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="button3"
-          @click="openStructIvt"
-        >
-          手工分配
-        </el-button>-->
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="warning"
-          :loading="loadingSetAllPoint"
-          icon="el-icon-check"
-          size="mini"
-          @click="allSetPointAllDtl"
-        >
-          一键设置
-        </el-button>
-      </span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        :data="tableDtl"
-        style="width: 100%;"
-        max-height="300"
-        border
-        :cell-style="cellStyle"
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDtlCurrentChange"
-      >
-        <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
-        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" align="center" width="140px" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
-        <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
-        <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
-      </el-table>
-    </el-card>
-    <div class="crud-opts2">
-      <span class="role-span">分配明细</span>
-      <div class="crud-opts-form">
-        <el-form ref="form2" :inline="true" :model="form2" size="mini">
-          <el-form-item label="待分配" prop="unassign_qty">
-            <el-input-number
-              v-model="form2.unassign_qty"
-              :controls="false"
-              :precision="3"
-              :min="0"
-              disabled
-            />
-          </el-form-item>
-          <el-form-item label="已分配" prop="assign_qty">
-            <el-input-number
-              v-model="form2.assign_qty"
-              :controls="false"
-              :precision="3"
-              :min="0"
-              disabled
-            />
-          </el-form-item>
-          <!--   <el-form-item label="出库点" prop="point_code">
-            <el-select
-              v-model="form2.point_code"
-              clearable
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in this.pointList"
-                :key="item.point_code"
-                :label="item.point_name"
-                :value="item.point_code"
-              />
-            </el-select>
-          </el-form-item>-->
-        </el-form>
-      </div>
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-        <!--      <el-button
-          slot="left"
-          class="filter-item"
-          :loading="loadingSetPoint"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          :disabled="button4"
-          @click="oneSetPoint2"
-        >
-          设置站点
-        </el-button>-->
-        <el-button
-          slot="left"
-          class="filter-item"
-          :loading="loadingSetAllPoint"
-          type="warning"
-          icon="el-icon-check"
-          :disabled="button5"
-          size="mini"
-          @click="allSetPoint"
-        >
-          一键设置
-        </el-button>
-      </span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
-      <!--表格渲染-->
-      <el-table
-        ref="table2"
-        :data="tabledis"
-        style="width: 100%;"
-        max-height="400"
-        size="mini"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDisCurrentChange"
-      >
-        <el-table-column prop="bill_status" label="状态" align="center" width="110px">
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.work_status"
-              class="filter-item"
-              :disabled="true"
-            >
-              <el-option
-                v-for="item in dict.work_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="material_name" label="物料名称" width="250px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
-        <el-table-column prop="material_spec" label="物料规格" width="150px" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
-        <el-table-column prop="pcsn" label="订单号" width="150px" :min-width="flexWidth('pcsn',crud.data,'订单号')" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" />
-        <el-table-column show-overflow-tooltip prop="struct_code" width="150px" label="点位编码" align="center" />
-        <el-table-column show-overflow-tooltip prop="struct_name" width="150px" label="点位名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="task_code" width="150px" label="任务号" align="center" />
-        <el-table-column show-overflow-tooltip prop="point_code" width="150px" label="出库点" align="center" />
-      </el-table>
-    </el-card>
-    <StructIvt :dialog-show.sync="structshow" :stor-id="storId" :open-array="openParam" :rowmst="openRow" @StructIvtClosed="queryTableDtl" />
-  </el-dialog>
-</template>
-
-<script>
-import CRUD, { crud } from '@crud/crud'
-import semiproductOut from './semiproductOut'
-import StructIvt from '@/views/wms/storage_manage/semiproduct/semiproductOut/StructIvt'
-import crudRegion from '@/api/wms/sch/region'
-import crudPoint from '@/api/wms/sch/point'
-
-export default {
-  name: 'DivDialog',
-  components: { StructIvt },
-  mixins: [crud()],
-  dicts: ['IO_BILL_STATUS', 'work_status'],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    rowmst: {
-      type: Object
-    },
-    openArray: {
-      type: Array,
-      default: () => { return [] }
-    },
-    storId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      loadingAlldiv: false,
-      loadingAutodiv: false,
-      loadingSetPoint: false,
-      loadingSetAllPoint: false,
-      areatype: '',
-      typedisable: false,
-      pointshow: false,
-      structshow: false,
-      button1: true,
-      button2: true,
-      button3: true,
-      button4: true,
-      button5: true,
-      tableDtl: [],
-      openParam: [],
-      mstrow: {},
-      openRow: {},
-      tabledis: [],
-      currentRow: {},
-      currentDis: {},
-      form: {
-        gender2: ''
-      },
-      form2: {
-        unassign_qty: '0',
-        assign_qty: '0',
-        point_code: ''
-      },
-      sects: [],
-      invtypelist: [],
-      pointList: [],
-      rules: {
-      }
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    },
-    openArray: {
-      handler(newValue, oldValue) {
-        this.tableDtl = newValue
-      }
-    },
-    rowmst: {
-      handler(newValue, oldValue) {
-        this.mstrow = newValue
-      }
-    }
-  },
-  methods: {
-    open() {
-      crudRegion.getRegionSelect({ 'stor_id': this.storId }).then(res => {
-        this.sects = res.content
-      })
-
-      const area_type = 'A1_CK01'
-      crudPoint.getPoint({ 'area_type': area_type }).then(res => {
-        this.pointList = res
-      })
-    },
-    close() {
-      this.$refs['form2'].resetFields()
-      this.tabledis = []
-      this.$emit('DivChanged')
-      this.$emit('update:dialogShow', false)
-    },
-    bill_statusFormat(row, column) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
-    },
-    quality_scodeFormat(row, column) {
-      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
-    },
-    invtypeFormat(row, column) {
-      for (const item of this.invtypelist) {
-        if (item.code === row.source_bill_type) {
-          return item.name
-        }
-      }
-    },
-    openPoint() {
-      if (this.mstrow.bill_type === '010101') {
-        this.areatype = "'31'"
-      } else if (this.mstrow.bill_type === '010201' || this.mstrow.bill_type === '010202' || this.mstrow.bill_type === '010401') {
-        this.areatype = "'21'"
-      } else if (this.mstrow.bill_type === '010503' || this.mstrow.bill_type === '010501') {
-        this.areatype = "'22','23','24'"
-      } else if (this.mstrow.bill_type === '010502') {
-        this.areatype = "'21','22','23','24'"
-      } else if (this.mstrow.bill_type === '010801') {
-        this.areatype = "'22','23','24','31','35'"
-      } else if (this.mstrow.bill_type === '010601') {
-        this.areatype = ''
-      }
-      this.pointshow = true
-      this.$refs.child.getMsg(this.areatype)
-    },
-    PointChanged(row) {
-      this.form2.point_code = row.point_code
-    },
-    openStructIvt() {
-      this.currentRow.remark = ''
-      this.currentRow.stor_id = this.storId
-      semiproductOut.getStructIvt(this.currentRow).then(res => {
-        this.openParam = res
-        this.structshow = true
-        this.openRow = this.currentRow
-      })
-    },
-    sectQueryChange(val) {
-      if (val.length === 1) {
-        this.mstrow.stor_id = val[0]
-        this.mstrow.sect_id = ''
-      }
-      if (val.length === 0) {
-        this.mstrow.sect_id = ''
-        this.mstrow.stor_id = ''
-      }
-      if (val.length === 2) {
-        this.mstrow.stor_id = val[0]
-        this.mstrow.sect_id = val[1]
-      }
-    },
-    tabledisabled(row) {
-      if ((row.work_status === '00' || row.work_status === '01') && row.is_issued === '0') {
-        return false
-      } else {
-        return true
-      }
-    },
-    deleteRow(row) {
-      semiproductOut.oneCancel(row).then(res => {
-        this.queryTableDtl()
-      })
-    },
-    handleDtlCurrentChange(current) {
-      if (current !== null) {
-        this.currentRow = current
-        this.form2.unassign_qty = current.unassign_qty
-        this.form2.assign_qty = current.assign_qty
-        this.tabledis = []
-        if (current.bill_status === '10') {
-          this.button1 = false
-          this.button2 = true
-          this.button5 = false
-          this.button3 = false
-        } else if (current.bill_status === '20') {
-          this.button1 = false
-          this.button2 = false
-          this.button3 = false
-          this.button5 = false
-        } else if (current.bill_status === '30') {
-          this.button1 = true
-          this.button2 = false
-          this.button3 = true
-          this.button5 = false
-        }
-        this.queryTableDdis(current.iostorinvdtl_id)
-      } else {
-        this.button1 = true
-        this.button2 = true
-        this.button3 = true
-        this.button5 = true
-        this.mstrow.iostorinvdtl_id = ''
-        this.currentRow = {}
-        this.tabledis = []
-      }
-    },
-    handleDisCurrentChange(current) {
-      if (current !== null) {
-        this.currentDis = current
-        if (current.work_status === '01' || current.work_status === '00') {
-          this.button4 = false
-        } else {
-          this.button4 = true
-        }
-      } else {
-        this.button4 = true
-        this.mstrow.iostorinvdis_id = ''
-        this.currentDis = {}
-      }
-    },
-    allDiv() {
-      this.loadingAlldiv = true
-      semiproductOut.allDiv(this.mstrow).then(res => {
-        this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.INFO)
-        this.queryTableDtl()
-        this.loadingAlldiv = false
-      }).catch(() => {
-        this.loadingAlldiv = false
-      })
-    },
-    oneDiv() {
-      this.loadingAutodiv = true
-      if (this.currentRow.iostorinvdtl_id !== null) {
-        this.mstrow.iostorinvdtl_id = this.currentRow.iostorinvdtl_id
-        semiproductOut.allDivOne(this.mstrow).then(res => {
-          this.queryTableDtl()
-          this.loadingAutodiv = false
-        }).catch(() => {
-          this.loadingAutodiv = false
-        })
-      }
-    },
-    allCancel() {
-      semiproductOut.allCancel(this.mstrow).then(res => {
-        this.queryTableDtl()
-      })
-    },
-    oneCancel() {
-      if (this.currentRow.iostorinvdtl_id !== null) {
-        semiproductOut.allCancel(this.currentRow).then(res => {
-          this.queryTableDtl()
-        })
-      }
-    },
-    allSetPoint() {
-    /*  if (this.form2.point_code === '') {
-        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }*/
-      if (this.currentRow === '') {
-        this.crud.notify('请选择明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.loadingSetAllPoint = true
-      this.currentRow.point_code = this.form2.point_code
-      semiproductOut.allSetPoint(this.currentRow).then(res => {
-        this.queryTableDdis(this.currentRow.iostorinvdtl_id)
-        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
-        this.loadingSetAllPoint = false
-      }).catch(() => {
-        this.loadingSetAllPoint = false
-      })
-    },
-    allSetPointAllDtl() {
-    /*  if (this.form2.point_code === '') {
-        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }*/
-      this.loadingSetAllPoint = true
-      const data = {
-        'point_code': this.form2.point_code,
-        'iostorinv_id': this.mstrow.iostorinv_id
-      }
-      semiproductOut.allSetPoint(data).then(res => {
-        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
-        this.loadingSetAllPoint = false
-      }).catch(() => {
-        this.loadingSetAllPoint = false
-      })
-    },
-    queryTableDtl() {
-      semiproductOut.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
-        this.tableDtl = res
-      })
-    },
-    queryTableDdis(iostorinvdtl_id) {
-      semiproductOut.getOutBillDis({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
-        this.tabledis = res
-      }).catch(() => {
-        this.tabledis = []
-      })
-    },
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      const assign_qty = parseFloat(row.assign_qty)
-      const plan_qty = parseFloat(row.plan_qty)
-
-      if (column.property === 'assign_qty') {
-        if (assign_qty > plan_qty) {
-          return 'background: yellow'
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style>
-.crud-opts2 {
-  padding: 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .el-dialog__title2 {
-  line-height: 24px;
-  font-size:20px;
-  color:#303133;
-}
-
-.crud-opts2 .role-span {
-  padding: 10px 0px 10px 0px;
-}
-.crud-opts2 .crud-opts-form {
-  padding: 10px 0px 0px 20px;
-}
-
-.input-with-select  {
-  background-color: #fff;
-}
-</style>

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/StructIvt.vue

@@ -1,278 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    :show-close="false"
-    fullscreen
-    @close="close"
-    @open="open"
-  >
-    <span slot="title" class="dialog-footer">
-      <div class="crud-opts2">
-        <span class="el-dialog__title2">出库手工分配</span>
-        <span class="crud-opts-right2">
-          <!--左侧插槽-->
-          <slot name="left" />
-          <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
-          <el-button slot="left" type="primary" @click="submit">保存</el-button>
-        </span>
-      </div>
-    </span>
-    <div class="crud-opts2">
-      <span class="role-span" style="width: 100px">可分配库存</span>
-      <div class="crud-opts-form">
-        <el-form ref="form2" :inline="true" :model="queryrow" size="mini">
-          <el-form-item label="待分配" prop="unassign_qty">
-            <el-input-number
-              v-model="queryrow.unassign_qty"
-              :controls="false"
-              :precision="3"
-              :min="0"
-              disabled
-            />
-          </el-form-item>
-          <el-form-item label="已分配" prop="assign_qty">
-            <el-input-number
-              v-model="queryrow.assign_qty"
-              :controls="false"
-              :precision="3"
-              :min="0"
-              disabled
-            />
-          </el-form-item>
-          <el-form-item label="库区" prop="sect_id">
-            <el-cascader
-              placeholder="请选择"
-              :options="sects"
-              :props="{ checkStrictly: true }"
-              clearable
-              @change="sectQueryChange"
-            />
-          </el-form-item>
-          <el-form-item label="关键字" prop="remark">
-            <el-input
-              v-model="queryrow.remark"
-              clearable
-              style="width: 220px"
-              size="mini"
-              placeholder="货位编码"
-              prefix-icon="el-icon-search"
-              class="filter-item"
-            />
-          </el-form-item>
-          <el-form-item label="sap批次" prop="remark">
-            <el-input
-              v-model="queryrow.sap_pcsn"
-              clearable
-              style="width: 220px"
-              size="mini"
-              placeholder="sap批次"
-              prefix-icon="el-icon-search"
-              class="filter-item"
-            />
-          </el-form-item>
-          <el-form-item label="子卷号" prop="remark">
-            <el-input
-              v-model="queryrow.pcsn"
-              clearable
-              style="width: 220px"
-              size="mini"
-              placeholder="子卷号"
-              prefix-icon="el-icon-search"
-              class="filter-item"
-            />
-          </el-form-item>
-          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">搜索</el-button>
-        </el-form>
-      </div>
-    </div>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      :data="tableDtl"
-      style="width: 100%;"
-      max-height="500"
-      border
-      :highlight-current-row="true"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column show-overflow-tooltip prop="sect_name" label="库区" align="center" />
-      <el-table-column show-overflow-tooltip prop="struct_code" label="仓位" align="center" />
-      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="箱号" align="center" width="250px" />
-      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-      <el-table-column show-overflow-tooltip sortable prop="pcsn" label="子卷批次号" align="center" width="150px" />
-      <el-table-column show-overflow-tooltip sortable prop="sap_pcsn" label="sap批次" align="center" width="140px" />
-      <el-table-column show-overflow-tooltip prop="canuse_qty" label="可出重量" :formatter="crud.formatNum3" align="center" />
-<!--      <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" width="160" align="center">-->
-<!--        <template scope="scope">-->
-<!--          <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :max="100000000" />-->
-<!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />-->
-      <el-table-column align="center" label="操作" width="160" fixed="right">
-        <template scope="scope">
-          <el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-          <el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { header } from '@crud/crud'
-// import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
-import productOut from '@/views/wms/storage_manage/product/productOut/productout'
-// import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
-
-export default {
-  name: 'StructIvt',
-  components: { },
-  mixins: [header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    rowmst: {
-      type: Object
-    },
-    openArray: {
-      type: Array,
-      default: () => { return [] }
-    },
-    storId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      dialogVisible2: false,
-      goal_unassign_qty: 0,
-      queryrow: {},
-      sects: [],
-      tableDtl: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    },
-    openArray: {
-      handler(newValue, oldValue) {
-        this.tableDtl = newValue
-      }
-    },
-    rowmst: {
-      handler(newValue, oldValue) {
-        this.queryrow = newValue
-        this.goal_unassign_qty = JSON.parse(JSON.stringify(this.queryrow.unassign_qty))
-      }
-    }
-  },
-  methods: {
-    open() {
-    /*  crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
-        this.sects = res.content
-      })*/
-      this.query.source_bill_code = this.queryrow.source_bill_code
-      this.query.material_id = this.queryrow.material_id
-    },
-    queryStruct() {
-      this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(this.queryrow.assign_qty)
-      this.queryrow.assign_qty = 0
-  /*    productOut.getStructIvt(this.queryrow).then(res => {
-        this.tableDtl = res
-      })*/
-    },
-    sectQueryChange(val) {
-      if (val.length === 1) {
-        this.queryrow.stor_id = val[0]
-        this.queryrow.sect_id = ''
-      }
-      if (val.length === 0) {
-        this.queryrow.sect_id = ''
-        this.queryrow.stor_id = ''
-      }
-      if (val.length === 2) {
-        this.queryrow.stor_id = val[0]
-        this.queryrow.sect_id = val[1]
-      }
-    },
-    handleEdit(index, row) {
-      // 判断是否可以关闭编辑状态
-      if (row.edit === undefined) {
-        this.$set(row, 'edit', false)
-      }
-      row.edit = !row.edit
-      if (row.edit) {
-        this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) - parseFloat(row.canuse_qty)
-        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) + parseFloat(row.canuse_qty)
-      } else {
-        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - parseFloat(row.canuse_qty)
-        // 如果待分配重量等于0则 明细重量 - 已分配重量
-        if (parseInt(this.queryrow.unassign_qty) === 0) {
-          this.queryrow.unassign_qty = parseFloat(this.goal_unassign_qty) - parseFloat(this.queryrow.assign_qty)
-        } else {
-          this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(row.canuse_qty)
-        }
-        if (this.queryrow.unassign_qty > this.goal_unassign_qty) {
-          this.queryrow.unassign_qty = JSON.parse(JSON.stringify(this.goal_unassign_qty))
-        }
-        // 如果已分配汇总量 > 明细重量 则待分配重量为0
-        if (this.queryrow.assign_qty > this.goal_unassign_qty) {
-          this.queryrow.unassign_qty = parseFloat('0')
-        }
-      }
-      this.tableDtl.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
-    },
-    close() {
-      this.$emit('update:dialogShow', false)
-      this.$emit('StructIvtClosed')
-    },
-    submit() {
-      if (parseFloat(this.queryrow.assign_qty) === 0) {
-        this.crud.notify('请分配后再提交', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-      if (parseFloat(this.queryrow.unassign_qty) === 0) {
-        const rows = []
-        this.tableDtl.forEach((item) => {
-          if (item.edit) {
-            rows.push(item)
-          }
-        })
-        productOut.manualDiv({ 'row': this.queryrow, 'rows': rows }).then(res => {
-          this.$emit('update:dialogShow', false)
-          this.$emit('StructIvtClosed')
-        })
-      } else {
-        this.$confirm('未分配重量不为0,是否继续提交？')
-          .then(_ => {
-            const rows = []
-            this.tableDtl.forEach((item) => {
-              if (item.edit) {
-                rows.push(item)
-              }
-            })
-            productOut.manualDiv({ 'row': this.queryrow, 'rows': rows }).then(res => {
-              this.$emit('update:dialogShow', false)
-              this.$emit('StructIvtClosed')
-            })
-          })
-          .catch(_ => {
-
-          })
-      }
-    }
-  }
-}
-</script>

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog.vue

@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    title="出库单详情"
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    fullscreen
-    @close="close"
-    @open="open"
-  >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
-      <el-form-item label="单据号" prop="bill_code">
-        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="生产车间">
-        <el-select
-          v-model="form.product_code"
-          clearable
-          size="mini"
-          placeholder="全部"
-          :disabled="true"
-          class="filter-item"
-          @change="crud.toQuery"
-        >
-          <el-option
-            v-for="item in dict.product_area"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="业务类型" prop="bill_type">
-        <el-select
-          v-model="form.bill_type"
-          clearable
-          filterable
-          size="mini"
-          placeholder="业务类型"
-          class="filter-item"
-          disabled
-        >
-          <el-option
-            v-for="item in dict.bill_type"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="单据状态" prop="bill_status">
-        <el-select
-          v-model="form.bill_status"
-          clearable
-          style="width: 210px"
-          placeholder="单据状态"
-          class="filter-item"
-          disabled
-        >
-          <el-option
-            v-for="item in dict.io_bill_status"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </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>
-      <el-form-item label="总重量" prop="total_qty">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
-        <el-input-number
-          v-model="form.total_qty"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <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="true" />
-      </el-form-item>
-    </el-form>
-    <div class="crud-opts2">
-      <span class="role-span2">出库明细</span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        :data="tableDtl"
-        style="width: 100%;"
-        max-height="300"
-        size="mini"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDtlCurrentChange"
-      >
-        <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
-        <el-table-column min-width="140" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column prop="pcsn" label="订单号" width="150px" align="center" show-overflow-tooltip />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column prop="assign_qty" :formatter="crud.formatNum3" label="已分配重量" align="center" width="100px" />
-        <el-table-column prop="unassign_qty" :formatter="crud.formatNum3" label="未分配重量" align="center" width="100px" />
-        <el-table-column prop="qty_unit_name" label="单位" align="center" />
-        <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
-      </el-table>
-    </el-card>
-    <div class="crud-opts2">
-      <span class="role-span">作业明细</span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
-      <!--表格渲染-->
-      <el-table
-        ref="table2"
-        :data="tabledis"
-        style="width: 100%;"
-        max-height="300"
-        size="mini"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        @current-change="handleDisCurrentChange"
-      >
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column prop="pcsn" label="订单号" align="center" show-overflow-tooltip />
-        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column prop="struct_code" label="仓位" align="center" show-overflow-tooltip />
-        <el-table-column prop="region_code" label="区域" align="center" show-overflow-tooltip />
-        <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
-      </el-table>
-    </el-card>
-  </el-dialog>
-</template>
-
-<script>
-
-import { crud } from '@crud/crud'
-import semiproductOut from './semiproductOut'
-import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-
-export default {
-  name: 'ViewDialog',
-  components: { },
-  mixins: [crud()],
-  dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'bill_type', 'product_area'],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    rowmst: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      tableDtl: [],
-      tabledis: [],
-      storlist: [],
-      currentdtl: null,
-      currentDis: {},
-      form: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    },
-    rowmst: {
-      handler(newValue) {
-        this.form = newValue
-      }
-    }
-  },
-  created() {
-    crudsemiproductIn.queryStor().then(res => {
-      this.storlist = res
-    })
-  },
-  methods: {
-    open() {
-      this.queryTableDtl()
-    },
-    close() {
-      this.$emit('update:dialogShow', false)
-      this.currentDis = {}
-      this.currentdtl = null
-      this.tableDtl = []
-      this.tabledis = []
-      this.$emit('AddChanged')
-    },
-    bill_statusFormat(row) {
-      return this.dict.label.io_bill_status[row.bill_status]
-    },
-    taskdtl_typeFormat(row) {
-      return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
-    },
-    task_statusFormat(row) {
-      return this.dict.label.task_status[row.task_status]
-    },
-    work_statusFormat(row) {
-      return this.dict.label.work_status[row.work_status]
-    },
-    handleDtlCurrentChange(current) {
-      if (current !== null) {
-        this.tabledis = []
-        this.currentdtl = current
-        this.queryTableDdis()
-      } else {
-        this.tabledis = []
-        this.currentdtl = {}
-      }
-    },
-    invtypeFormat(row, column) {
-      for (const item of this.billtypelist) {
-        if (item.code === row.source_bill_type) {
-          return item.name
-        }
-      }
-    },
-    handleDisCurrentChange(current) {
-      this.currentDis = current
-    },
-    queryTableDtl() {
-      semiproductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.tableDtl = res
-      })
-    },
-    queryTableDdis() {
-      if (this.currentdtl !== null) {
-        semiproductOut.getOutBillDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
-          this.tabledis = res
-        }).catch(() => {
-          this.tabledis = []
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style>
-.crud-opts2 {
-  padding: 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .el-dialog__title2 {
-  line-height: 24px;
-  font-size:20px;
-  color:#303133;
-}
-
-.crud-opts2 .role-span2 {
-  padding: 0px 0px 20px 0px;
-}
-.crud-opts2 {
-  padding: 10px 0px 0px 50px;
-}
-
-</style>

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/index.vue

@@ -1,325 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="80px"
-          label-suffix=":"
-        >
-          <el-form-item label="模糊查询">
-            <el-input
-              v-model="query.bill_code"
-              size="mini"
-              clearable
-              placeholder="单据号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="生产车间">
-            <el-select
-              v-model="query.product_code"
-              clearable
-              size="mini"
-              placeholder="全部"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.product_area"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </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.bill_type"
-              clearable
-              filterable
-              size="mini"
-              placeholder="业务类型"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.bill_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="dis_flag"
-          @click="divOpen"
-        >
-          分配
-        </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          :loading="loadingConfirm"
-          type="warning"
-          :disabled="confirm_flag"
-          icon="el-icon-check"
-          size="mini"
-          @click="confirm"
-        >
-          强制确认
-        </el-button>
-      </crudOperation>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        size="mini"
-        :data="crud.data"
-        style="width: 100%;"
-        :highlight-current-row="true"
-        @selection-change="crud.selectionChangeHandler"
-        @current-change="handleCurrentChange"
-        @select="handleSelectionChange"
-        @select-all="onSelectAll"
-      >
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :disabled-edit="canUd(scope.row)"
-              :disabled-dle="canUd(scope.row)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
-          <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="80" prop="bill_status" label="单据状态" />
-        <el-table-column show-overflow-tooltip prop="product_code" label="生产车间" width="80" />
-        <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
-        <el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
-        <el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />
-        <el-table-column show-overflow-tooltip label="总重量" align="center" prop="total_qty" width="100" />
-        <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
-        <el-table-column show-overflow-tooltip label="制单人" align="center" prop="create_name" />
-        <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="create_time" width="140" />
-        <el-table-column show-overflow-tooltip label="修改人" align="center" prop="update_name" />
-        <el-table-column show-overflow-tooltip label="修改时间" align="center" prop="update_time" width="140" />
-        <el-table-column show-overflow-tooltip label="分配人" align="center" prop="dis_name" />
-        <el-table-column show-overflow-tooltip label="分配时间" align="center" prop="dis_time" width="140" />
-        <el-table-column show-overflow-tooltip label="确认人" align="center" prop="confirm_name" />
-        <el-table-column show-overflow-tooltip label="确认时间" align="center" prop="confirm_time" width="140" />
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <AddDialog @AddChanged="querytable" />
-    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
-    <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
-  </div>
-</template>
-
-<script>
-import semiproductOut from './semiproductOut'
-import CRUD, { crud, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/AddDialog'
-import DivDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/DivDialog'
-import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/ViewDialog'
-import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-
-export default {
-  name: 'semiproductOut',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog },
-  cruds() {
-    return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/semiproductOut', crudMethod: { ...semiproductOut },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        reset: true,
-        download: false
-      }})
-  },
-  mixins: [presenter(), header(), crud()],
-  // 数据字典
-  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
-  data() {
-    return {
-      height: document.documentElement.clientHeight - 180 + 'px;',
-      permission: {
-        add: ['admin', 'checkoutbill:add'],
-        edit: ['admin', 'checkoutbill:edit'],
-        del: ['admin', 'checkoutbill:del']
-      },
-      openMoneyDialog: false,
-      loadingConfirm: false,
-      divShow: false,
-      taskShow: false,
-      dis_flag: true,
-      work_flag: true,
-      confirm_flag: true,
-      openParam: [],
-      openParamMoney: null,
-      mstrow: {},
-      viewShow: false,
-      currentRow: null,
-      checkrows: [],
-      billtypelist: [],
-      storlist: [],
-      storId: null
-    }
-  },
-  mounted: function() {
-    const that = this
-    window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 180 + 'px;'
-    }
-  },
-  created() {
-    crudsemiproductIn.queryStor().then(res => {
-      this.storlist = res
-    })
-  },
-  methods: {
-    canUd(row) {
-      return row.bill_status !== '10'
-    },
-    toView(index, row) {
-      this.mstrow = row
-      this.viewShow = true
-    },
-    [CRUD.HOOK.beforeRefresh]() {
-      this.handleCurrentChange(null)
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-        this.buttonChange(row)
-      } else if (val.length === 1) {
-        this.buttonChange(row)
-      } else {
-        this.handleCurrentChange(null)
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-      this.handleCurrentChange(null)
-    },
-    buttonChange(current) {
-      if (current !== null) {
-        this.currentRow = current
-        if (current.bill_status === '10' || current.bill_status === '20' || current.bill_status === '30') {
-          this.dis_flag = false
-        } else {
-          this.dis_flag = true
-        }
-        if (current.bill_status === '30') {
-          this.confirm_flag = false
-        } else {
-          this.confirm_flag = true
-        }
-      }
-    },
-    stateFormat(row, column) {
-      return this.dict.label.IO_BILL_STATUS[row.bill_status]
-    },
-    bill_typeFormat(row) {
-      return this.dict.label.bill_type[row.bill_type]
-    },
-    handleCurrentChange(current) {
-      if (current === null) {
-        this.dis_flag = true
-        this.confirm_flag = true
-        this.work_flag = true
-        this.currentRow = {}
-      }
-    },
-    checkboxT(row) {
-      return row.bill_status !== '99'
-    },
-    divOpen() {
-      semiproductOut.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
-        debugger
-        this.openParam = res
-        this.storId = this.currentRow.product_code
-        this.divShow = true
-        this.mstrow = this.currentRow
-      })
-    },
-    confirm() {
-      this.loadingConfirm = true
-      semiproductOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
-        this.querytable()
-        this.crud.notify('出库成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.loadingConfirm = false
-      }).catch(() => {
-        this.loadingConfirm = false
-      })
-    },
-    querytable() {
-      this.onSelectAll()
-      this.crud.toQuery()
-      this.handleCurrentChange(null)
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-top: 10px;
-}
-</style>

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/semiproductOut.js

@@ -1,228 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/productOut',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/productOut/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/productOut',
-    method: 'put',
-    data
-  })
-}
-
-export function getOutBillDtl(data) {
-  return request({
-    url: '/api/productOut/getOutBillDtl',
-    method: 'post',
-    data
-  })
-}
-export function getOutBillDis(data) {
-  return request({
-    url: '/api/productOut/getOutBillDis',
-    method: 'post',
-    data
-  })
-}
-export function getOutBillDisDtl(params) {
-  return request({
-    url: '/api/productOut/getOutBillDisDtl',
-    method: 'get',
-    params
-  })
-}
-export function getOutBillTask(params) {
-  return request({
-    url: '/api/productOut/getOutBillTask',
-    method: 'get',
-    params
-  })
-}
-export function getInvTypes() {
-  return request({
-    url: '/api/productOut/getInvTypes',
-    method: 'get'
-  })
-}
-export function insertDtl(data) {
-  return request({
-    url: '/api/productOut/insertDtl',
-    method: 'post',
-    data
-  })
-}
-export function allDiv(data) {
-  return request({
-    url: '/api/productOut/allDiv',
-    method: 'post',
-    data
-  })
-}
-export function allDivOne(data) {
-  return request({
-    url: '/api/productOut/allDivOne',
-    method: 'post',
-    data
-  })
-}
-export function allCancel(data) {
-  return request({
-    url: '/api/productOut/allCancel',
-    method: 'post',
-    data
-  })
-}
-export function oneCancel(data) {
-  return request({
-    url: '/api/productOut/oneCancel',
-    method: 'post',
-    data
-  })
-}
-export function setPoint(data) {
-  return request({
-    url: '/api/productOut/setPoint',
-    method: 'post',
-    data
-  })
-}
-export function oneSetPoint(data) {
-  return request({
-    url: '/api/productOut/oneSetPoint',
-    method: 'post',
-    data
-  })
-}
-export function getStructIvt(params) {
-  return request({
-    url: '/api/productOut/getStructIvt',
-    method: 'get',
-    params
-  })
-}
-export function manualDiv(data) {
-  return request({
-    url: '/api/productOut/manualDiv',
-    method: 'post',
-    data
-  })
-}
-export function confirm(data) {
-  return request({
-    url: '/api/productOut/confirm',
-    method: 'post',
-    data
-  })
-}
-export function issueTask(data) {
-  return request({
-    url: '/api/productOut/issueTask',
-    method: 'post',
-    data
-  })
-}
-export function finishTask(data) {
-  return request({
-    url: '/api/productOut/finishTask',
-    method: 'post',
-    data
-  })
-}
-export function cancleTaskfinish(data) {
-  return request({
-    url: '/api/productOut/cancleTaskfinish',
-    method: 'post',
-    data
-  })
-}
-export function paramByCodeType(data) {
-  return request({
-    url: '/api/productOut/paramByCodeType',
-    method: 'post',
-    data
-  })
-}
-export function schAreaType(data) {
-  return request({
-    url: '/api/productOut/schAreaType',
-    method: 'post',
-    data
-  })
-}
-export function backConfirm(data) {
-  return request({
-    url: '/api/productOut/backConfirm',
-    method: 'post',
-    data
-  })
-}
-export function getType() {
-  return request({
-    url: '/api/productOut/getType',
-    method: 'get'
-  })
-}
-export function moneySubmit(data) {
-  return request({
-    url: '/api/productOut/moneySubmit',
-    method: 'post',
-    data
-  })
-}
-export function getDisNum(data) {
-  return request({
-    url: '/api/productOut/getDisNum',
-    method: 'post',
-    data
-  })
-}
-export function queryBox(data) {
-  return request({
-    url: '/api/productOut/queryBox',
-    method: 'post',
-    data
-  })
-}
-export function getOutBillTask2(data) {
-  return request({
-    url: '/api/productOut/getOutBillTask2',
-    method: 'post',
-    data
-  })
-}
-export function cancelTask(data) {
-  return request({
-    url: '/api/productOut/cancelTask',
-    method: 'post',
-    data
-  })
-}
-export function allSetPoint(data) {
-  return request({
-    url: '/api/productOut/allSetPoint',
-    method: 'post',
-    data
-  })
-}
-export function oneSetPoint2(data) {
-  return request({
-    url: '/api/productOut/oneSetPoint2',
-    method: 'post',
-    data
-  })
-}
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/workprocedureios.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/workprocedureiosIn',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/workprocedureiosIn/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/workprocedureiosIn',
-    method: 'put',
-    data
-  })
-}
-
-export function getBillTypes() {
-  return request({
-    url: 'api/workprocedureiosIn/getBillTypes',
-    method: 'get'
-  })
-}
-
-export function selectStartPoint(data) {
-  return request({
-    url: 'api/workprocedureiosIn/selectStartPoint',
-    method: 'post',
-    data
-  })
-}
-
-export function getStartArea(data) {
-  return request({
-    url: 'api/workprocedureiosIn/getStartArea',
-    method: 'post',
-    data
-  })
-}
-
-export function getEndArea(data) {
-  return request({
-    url: 'api/workprocedureiosIn/getEndArea',
-    method: 'post',
-    data
-  })
-}
-
-export function genTask(data) {
-  return request({
-    url: 'api/workprocedureiosIn/genTask',
-    method: 'post',
-    data
-  })
-}
-
-export function getEndAareaByworkprocedureId(data) {
-  return request({
-    url: 'api/workprocedureiosIn/getEndAareaByworkprocedureId',
-    method: 'post',
-    data
-  })
-}
-export default { add, edit, del, getBillTypes, selectStartPoint, getStartArea, getEndArea, genTask, getEndAareaByworkprocedureId }

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/workprocedureiosOut.js

@@ -1,89 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/workprocedureiosOut',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/workprocedureiosOut/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/workprocedureiosOut',
-    method: 'put',
-    data
-  })
-}
-
-export function getBillTypes() {
-  return request({
-    url: 'api/workprocedureiosOut/getBillTypes',
-    method: 'get'
-  })
-}
-
-export function selectStartPoint(data) {
-  return request({
-    url: 'api/workprocedureiosOut/selectStartPoint',
-    method: 'post',
-    data
-  })
-}
-
-export function getEndArea(data) {
-  return request({
-    url: 'api/workprocedureiosOut/getEndArea',
-    method: 'post',
-    data
-  })
-}
-
-export function genTask(data) {
-  return request({
-    url: 'api/workprocedureiosOut/genTask',
-    method: 'post',
-    data
-  })
-}
-
-export function selectEndPoint(data) {
-  return request({
-    url: 'api/workprocedureiosOut/selectEndPoint',
-    method: 'post',
-    data
-  })
-}
-
-export function getEndAareaByworkprocedureId(data) {
-  return request({
-    url: 'api/workprocedureiosOut/getEndAareaByworkprocedureId',
-    method: 'post',
-    data
-  })
-}
-
-export function queryWorkprocedure() {
-  return request({
-    url: 'api/workProcedure/queryWorkprocedure',
-    method: 'get'
-  })
-}
-
-export function getIvtWorkprocedureId(data) {
-  return request({
-    url: 'api/workprocedureiosOut/getIvtWorkprocedureId',
-    method: 'post',
-    data
-  })
-}
-
-export default { add, edit, del, getBillTypes, selectStartPoint, getEndArea, genTask, selectEndPoint, getEndAareaByworkprocedureId, queryWorkprocedure, getIvtWorkprocedureId }