From d4b1400ed6eee9aa983a9e9a608dc8aa3fd3b8c6 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 31 May 2023 09:13:31 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=8D=8A=E6=88=90=E5=93=81=E6=8B=BC?=
 =?UTF-8?q?=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../semiproductMoreOrless/AddDialog.vue       | 51 ++++++-----
 .../semiproductShutFrame/index.vue            | 14 ++--
 .../semiproduct/semiproductout/AddDialog.vue  | 84 ++++++++++++-------
 .../semiproduct/semiproductout/StructIvt.vue  | 28 +++----
 4 files changed, 103 insertions(+), 74 deletions(-)

diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue
index 86feabc0..a10f7e58 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue
@@ -11,7 +11,7 @@
   >
     <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>
@@ -39,7 +39,7 @@
     >
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
+        <el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="仓库" prop="stor_id">
         <label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
@@ -79,12 +79,12 @@
       <el-form-item label="货位" prop="struct_code">
         <label slot="label">货&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位:</label>
         <el-input v-model.trim="form.struct_code" style="width: 210px" disabled placeholder="选择货位">
-          <el-button v-show="crud.status.view <= 0" slot="append" icon="el-icon-plus" @click="queryStruct()"/>
+          <el-button v-show="crud.status.view <= 0" slot="append" icon="el-icon-plus" @click="queryStruct()" />
         </el-input>
       </el-form-item>
       <el-form-item label="明细数" prop="detail_count">
         <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px"/>
+        <el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px" />
       </el-form-item>
       <el-form-item label="总重量" prop="total_qty">
         <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -113,7 +113,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"
@@ -148,18 +148,23 @@
       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 prop="material_code" label="物料编码" align="center" min-width="200" show-overflow-tooltip>
         <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-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="200" show-overflow-tooltip/>
-      <el-table-column v-if="!crud.status.view > 0" prop="ivt_qty" label="库存重量" align="center"
-                       :formatter="crud.formatNum3"/>
+      <el-table-column prop="material_name" label="物料名称" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column
+        v-if="!crud.status.view > 0"
+        prop="ivt_qty"
+        label="库存重量"
+        align="center"
+        :formatter="crud.formatNum3"
+      />
       <el-table-column prop="mol_qty" width="220" label="损溢重量" align="center">
         <template scope="scope">
           <el-input-number
@@ -172,7 +177,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="qty_unit_name" label="单位" align="center"/>
+      <el-table-column prop="qty_unit_name" label="单位" align="center" />
       <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="190" fixed="right">
         <template scope="scope">
           <el-button
@@ -204,15 +209,15 @@
       </el-table-column>
     </el-table>
 
-    <MaterDtl :dialog-show.sync="materShow" @setMaterValue="tableChanged2"/>
-    <StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="tableChanged"/>
+    <MaterDtl :dialog-show.sync="materShow" @setMaterValue="tableChanged2" />
+    <StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="tableChanged" />
   </el-dialog>
 </template>
 
 <script>
 import crudOperation from '@crud/CRUD.operation'
 import BucketDialog from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/NewBucketDialog'
-import CRUD, {crud, form} from '@crud/crud'
+import CRUD, { crud, form } from '@crud/crud'
 import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
 import crudMoreOrless from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
@@ -237,7 +242,7 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: {crudOperation, MaterDtl, StructDiv, BucketDialog},
+  components: { crudOperation, MaterDtl, StructDiv, BucketDialog },
   mixins: [crud(), form(defaultForm)],
   dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'ST_MOL_TYPE'],
   props: {
@@ -263,13 +268,13 @@ export default {
       storlist: [],
       rules: {
         stor_id: [
-          {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' }
         ]
       }
     }
@@ -284,13 +289,13 @@ export default {
   methods: {
     open() {
       // 查询原材料库的仓库
-      crudStorattr.getStor({'stor_type': '3'}).then(res => {
+      crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
         this.storlist = res.content
       })
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudMoreOrless.getMlDtl({'mol_id': this.form.mol_id}).then(res => {
+      crudMoreOrless.getMlDtl({ 'mol_id': this.form.mol_id }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -346,13 +351,13 @@ export default {
         return false
       }
       if (this.crud.status.add > 0) {
-        crudMoreOrless.getStructIvt({'struct_id': this.form.struct_id}).then(res => {
+        crudMoreOrless.getStructIvt({ 'struct_id': this.form.struct_id }).then(res => {
           this.form.tableData = res
           this.form.dtl_num = this.form.tableData.length
         })
       }
       if (this.crud.status.edit > 0) {
-        crudMoreOrless.queryMolDtl({'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id}).then(res => {
+        crudMoreOrless.queryMolDtl({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
           this.form.tableData = res
           this.form.dtl_num = this.form.tableData.length
         })
@@ -378,7 +383,7 @@ export default {
       this.form.sect_id = row.sect_id
       this.form.sect_name = row.sect_name
       this.form.struct_name = row.struct_name
-      crudMoreOrless.getStructIvt({'struct_id': row.struct_id}).then(res => {
+      crudMoreOrless.getStructIvt({ 'struct_id': row.struct_id }).then(res => {
         this.form.tableData = res
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue
index 4bbf70cc..21ed9d4a 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/index.vue
@@ -158,18 +158,18 @@
           </template>
         </el-table-column>
         <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column  prop="bill_code" min-width="140" label="订单编码">
+        <el-table-column prop="bill_code" min-width="140" label="订单编码">
           <template slot-scope="scope">
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column  :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
+        <el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
         <el-table-column prop="stor_name" label="仓库" min-width="100" />
-        <el-table-column  prop="bill_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
-        <el-table-column  min-width="135" prop="biz_date" label="业务日期" />
-        <el-table-column  :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
+        <el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
+        <el-table-column min-width="135" prop="biz_date" label="业务日期" />
+        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
         <el-table-column label="制单人" align="center" prop="input_optname" min-width="100" />
-        <el-table-column  prop="input_time" min-width="135" label="制单时间" />
+        <el-table-column prop="input_time" min-width="135" label="制单时间" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -253,7 +253,7 @@ export default {
         this.buttonChange(row)
       } else if (val.length === 1) {
         this.buttonChange(row)
-      }else{
+      } else {
         this.handleCurrentChange(null)
       }
     },
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue
index 879a7294..2c925eda 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue
@@ -11,26 +11,45 @@
   >
     <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="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-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="stor_id">
         <label slot="label">所属仓库:</label>
@@ -102,7 +121,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>
@@ -116,8 +135,13 @@
       </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>
 
@@ -125,7 +149,7 @@
     <div v-show="crud.status.add === 1" 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"
@@ -147,14 +171,14 @@
       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="struct_code" 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="数量"/>
-      <el-table-column show-overflow-tooltip prop="unit_weight" label="单重"/>
-      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号"/>
+      <el-table-column show-overflow-tooltip prop="struct_code" 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="数量" />
+      <el-table-column show-overflow-tooltip prop="unit_weight" label="单重" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
       <el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
           <el-button
@@ -179,7 +203,7 @@
 </template>
 
 <script>
-import CRUD, {crud, form} from '@crud/crud'
+import CRUD, { crud, form } from '@crud/crud'
 import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 import MaterDtl from '@/views/wms/storage_manage/semiproduct/semiproductout/StructIvt'
 import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
@@ -199,11 +223,11 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: {MaterDtl},
+  components: { MaterDtl },
   mixins: [crud(), form(defaultForm)],
   dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_OUT_TYPE', 'product_area'],
   cruds() {
-    return CRUD({title: '入库新增', crudMethod: {...crudsemiproductIn}})
+    return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductIn }})
   },
   props: {
     dialogShow: {
@@ -225,19 +249,19 @@ export default {
       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' }
         ],
         stor_id: [
-          { required: true, message: '所属仓库不能为空', trigger: 'blur'}
+          { required: true, message: '所属仓库不能为空', trigger: 'blur' }
         ],
         point_code: [
-          { required: true, message: '出库点不能为空', trigger: 'blur'}
+          { required: true, message: '出库点不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -251,7 +275,7 @@ export default {
   },
   methods: {
     open() {
-      crudStorattr.getStor({'stor_type': '2'}).then(res => {
+      crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
         this.storlist = res.content
       })
     },
@@ -260,7 +284,7 @@ export default {
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudsemiproductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
+      crudsemiproductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -270,7 +294,7 @@ export default {
       })
     },
     [CRUD.HOOK.afterToView]() {
-      crudsemiproductIn.getIODtl({'bill_code': this.form.bill_code}).then(res => {
+      crudsemiproductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res.content
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue
index 461ab339..19d56de1 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue
@@ -42,11 +42,11 @@
             />
           </el-form-item>
 
-          <rrOperation/>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation/>
+      <crudOperation />
       <!--表格渲染-->
       <el-table
         ref="multipleTable"
@@ -55,17 +55,17 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column show-overflow-tooltip width="100" prop="sect_code" label="库区"/>
-        <el-table-column show-overflow-tooltip width="150" prop="struct_name" label="货位"/>
-        <el-table-column show-overflow-tooltip prop="material_code" width="100" label="物料编号"/>
-        <el-table-column show-overflow-tooltip width="300" prop="material_name" label="物料名称"/>
-        <el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="数量（个）"/>
-        <el-table-column show-overflow-tooltip width="100" prop="unit_weight" label="单重"/>
-        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号"/>
+        <el-table-column type="selection" width="55" />
+        <el-table-column show-overflow-tooltip width="100" prop="sect_code" label="库区" />
+        <el-table-column show-overflow-tooltip width="150" prop="struct_name" label="货位" />
+        <el-table-column show-overflow-tooltip prop="material_code" width="100" label="物料编号" />
+        <el-table-column show-overflow-tooltip width="300" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip width="150" prop="canuse_qty" label="数量（个）" />
+        <el-table-column show-overflow-tooltip width="100" prop="unit_weight" label="单重" />
+        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
 
     <span slot="footer" class="dialog-footer">
@@ -77,7 +77,7 @@
 
 <script>
 
-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 pagination from '@crud/Pagination'
@@ -87,7 +87,7 @@ import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/ra
 const start = new Date()
 export default {
   name: 'AddDtl',
-  components: {crudOperation, rrOperation, pagination, DateRangePicker},
+  components: { crudOperation, rrOperation, pagination, DateRangePicker },
   cruds() {
     return CRUD({
       title: '半成品可用库存',
@@ -120,7 +120,7 @@ export default {
     }
   },
   methods: {
-    objectSpanMethod({row, column, rowIndex, columnIndex}) {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
         if (rowIndex % 2 === 0) {
           return {