From 582fd03ad78b254b71b5d1a2376724c20a0e7745 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 18 Jul 2024 17:40:58 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E7=9B=98=E7=82=B9=E3=80=81=E6=8D=9F?=
 =?UTF-8?q?=E7=9B=8A=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/checkStorage/index.vue          | 67 ++++++++++---------
 .../warehouse/profitAndLoss/index.vue         | 13 ++--
 2 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue
index d30cc0b8..b58d0c53 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue
@@ -16,6 +16,7 @@
               v-model="query.form_type"
               filterable
               size="mini"
+              disabled
               placeholder="请选择/搜索"
               class="filter-item"
               @change="crud.toQuery()"
@@ -31,10 +32,10 @@
           <template v-for="(col,index) in cols" v-if="hideShowDialog">
             <el-form-item label="col.lable">
               <label slot="label">{{ col.lable }}:</label>
-              <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
+              <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px"/>
             </el-form-item>
           </template>
-          <rrOperation :crud="crud" />
+          <rrOperation :crud="crud"/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -43,7 +44,7 @@
           slot="right"
           class="filter-item"
           type="warning"
-          icon="el-icon-position"
+          icon="el-icon-bottom-right"
           size="mini"
           :disabled="task_flag"
           @click="taskOpen"
@@ -54,7 +55,7 @@
           slot="right"
           class="filter-item"
           type="success"
-          icon="el-icon-position"
+          icon="el-icon-circle-check"
           size="mini"
           :disabled="dis_flag"
           @click="disOpen"
@@ -64,8 +65,8 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="primary"
-          icon="el-icon-position"
+          type="danger"
+          icon="el-icon-finished"
           size="mini"
           :disabled="finish_flag"
           @click="checkFinish"
@@ -81,17 +82,17 @@
         @select="handleSelectionChange"
         :data="crud.data"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
-              scope.row.code
-            }}
+                scope.row.code
+              }}
             </el-link>
             <span v-else>{{ scope.row.code }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
         <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <template v-for="item in statusEnum.FORM_STATUS">
@@ -99,10 +100,12 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column  v-for="(item, index) in cols" :key="item.value"  :label="item.lable" >
+        <el-table-column v-for="(item, index) in cols" :key="item.value" :label="item.lable">
           <template slot-scope="scope">
-            <spen v-if="item.value =='stor_code'">{{ tableEnum.label.st_ivt_bsrealstorattr[scope.row.form_data[item.value]]}}</spen>
-            <spen v-if="item.value !='stor_code'">{{scope.row.form_data[item.value]}}</spen>
+            <spen v-if="item.value =='stor_code'">
+              {{ tableEnum.label.st_ivt_bsrealstorattr[scope.row.form_data[item.value]] }}
+            </spen>
+            <spen v-if="item.value !='stor_code'">{{ scope.row.form_data[item.value] }}</spen>
           </template>
         </el-table-column>
         <el-table-column
@@ -114,12 +117,12 @@
         >
           <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_time" label="创建时间" />
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="update_time" label="修改时间" />
-        <el-table-column prop="create_name" label="修改人" />
-        <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
+        <el-table-column prop="proc_inst_id" label="流程实例" show-overflow-tooltip width="120"/>
+        <el-table-column prop="remark" label="备注"/>
+        <el-table-column prop="create_time" label="创建时间" width="150"/>
+        <el-table-column prop="create_name" label="创建人"/>
+        <el-table-column prop="update_time" label="修改时间" width="150"/>
+        <el-table-column prop="create_name" label="修改人"/>
         <el-table-column
           label="操作"
           fixed="right"
@@ -133,10 +136,10 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <AddDialog ref="viewDialog" />
-    <ViewDialog ref="viewDialog" />
+    <AddDialog ref="viewDialog"/>
+    <ViewDialog ref="viewDialog"/>
     <TaskDialog ref="taskDis"/>
 
   </div>
@@ -144,7 +147,7 @@
 
 <script>
 import crudFormData from './formData'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, {crud, form, header, presenter} from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import rrOperation from '@crud/RR.operation'
@@ -179,9 +182,9 @@ const defaultForm = {
 export default {
   name: 'FormData',
   statusEnums: ['FORM_STATUS'],
-  components: { pagination, crudOperation, rrOperation, udOperation, AddDialog ,ViewDialog, TaskDialog },
+  components: {pagination, crudOperation, rrOperation, udOperation, AddDialog, ViewDialog, TaskDialog},
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
+  tableEnums: ['st_ivt_bsrealstorattr#stor_name#stor_code'],
 
   cruds() {
     return CRUD({
@@ -189,13 +192,13 @@ export default {
       url: 'api/pmFormData',
       idField: 'id',
       sort: 'id,desc',
-      crudMethod: { ...crudFormData },
+      crudMethod: {...crudFormData},
       optShow: {
         add: true,
         reset: true
       },
       query: {
-        form_type:'st_ivt_check',
+        form_type: 'st_ivt_check',
         form_data: {}
       }
     })
@@ -260,14 +263,14 @@ export default {
 
     handleSelectionChange(val, row) {
       if (val.length === 1) {
-        if (row.status == '10'){
+        if (row.status == '10') {
           this.task_flag = false
-        }else {
+        } else {
           this.task_flag = true
         }
-        if (row.status == '13'){
+        if (row.status == '13') {
           this.finish_flag = false
-        }else {
+        } else {
           this.finish_flag = true
         }
         this.dis_flag = false
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/profitAndLoss/index.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/profitAndLoss/index.vue
index c6f12acd..e2792a3f 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/profitAndLoss/index.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/profitAndLoss/index.vue
@@ -16,6 +16,7 @@
               v-model="query.form_type"
               filterable
               size="mini"
+              disabled
               placeholder="请选择/搜索"
               class="filter-item"
               @change="crud.toQuery()"
@@ -42,8 +43,8 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
-          icon="el-icon-position"
+          type="warning"
+          icon="el-icon-bottom-right"
           size="mini"
           :disabled="task_flag"
           @click="taskOpen"
@@ -60,7 +61,7 @@
         :data="crud.data"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
+        <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
               scope.row.code
@@ -86,12 +87,12 @@
         >
           <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>
+        <el-table-column prop="proc_inst_id" label="流程实例" show-overflow-tooltip width="120" />
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column prop="create_time" label="创建时间" width="150" />
         <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column prop="update_time" label="修改时间" width="150" />
         <el-table-column prop="create_name" label="修改人" />
-        <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
         <el-table-column
           label="操作"
           fixed="right"