Qukatie 1 yıl önce
ebeveyn
işleme
7df68b4793

+ 94 - 142
src/views/basicData/commodityType/index.vue

@@ -4,82 +4,33 @@
       <el-row>
         <el-col :span="5">
           <basic-container>
-            <avue-tree
-              :option="treeOption"
-              :data="treeData"
-              @node-click="nodeClick"
-            />
+            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
           </basic-container>
         </el-col>
         <el-col :span="19">
           <basic-container class="page-crad">
-            <avue-crud
-              :option="option"
-              :search.sync="search"
-              :table-loading="loading"
-              :data="data"
-              ref="crud"
-              v-model="form"
-              :permission="permissionList"
-              @row-del="rowDel"
-              @row-update="rowUpdate"
-              @row-save="rowSave"
-              :before-open="beforeOpen"
-              :page.sync="page"
-              @search-change="searchChange"
-              @search-reset="searchReset"
-              @selection-change="selectionChange"
-              @current-change="currentChange"
-              @size-change="sizeChange"
-              @refresh-change="refreshChange"
-              @on-load="onLoad"
-              @search-criteria-switch="searchCriteriaSwitch"
-            >
+            <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+              v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+              :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
+              @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+              @refresh-change="refreshChange" @on-load="onLoad" @search-criteria-switch="searchCriteriaSwitch">
               <template slot="menuLeft">
-                <el-button
-                  type="primary"
-                  size="small"
-                  icon="el-icon-bottom"
-                  @click="excelBox = true"
-                  >导入
+                <el-button type="primary" size="small" icon="el-icon-bottom" @click="excelBox = true">导入
                 </el-button>
-                <el-button
-                  type="primary"
-                  size="small"
-                  v-if="isDisplayExport"
-                  icon="el-icon-top"
-                  @click="dataListExport"
-                >导出
+                <el-button type="primary" size="small" v-if="isDisplayExport" icon="el-icon-top"
+                  @click="dataListExport">导出
                 </el-button>
-                <el-button
-                  type="success"
-                  size="small"
-                  @click.stop="copyDoc()"
-                  :disabled="selectionList.length != 1"
-                  >复制单据</el-button
-                >
+                <el-button type="success" size="small" @click.stop="copyDoc()"
+                  :disabled="selectionList.length != 1">复制单据</el-button>
+                  <el-button type="primary" size="small" icon="el-icon-bottom" @click="excelAdminProfiles = true">批量修改分管员
+                  </el-button>
               </template>
               <template slot-scope="scope" slot="menu">
-                <el-button
-                  type="text"
-                  icon="el-icon-view"
-                  size="small"
-                  @click.stop="editOpen(scope.row, 1)"
-                  >查看
+                <el-button type="text" icon="el-icon-view" size="small" @click.stop="editOpen(scope.row, 1)">查看
                 </el-button>
-                <el-button
-                  type="text"
-                  icon="el-icon-edit"
-                  size="small"
-                  @click.stop="editOpen(scope.row, 1)"
-                  >编辑
+                <el-button type="text" icon="el-icon-edit" size="small" @click.stop="editOpen(scope.row, 1)">编辑
                 </el-button>
-                <el-button
-                  type="text"
-                  icon="el-icon-delete"
-                  size="small"
-                  @click.stop="rowDel(scope.row, scope.index)"
-                  >删除
+                <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(scope.row, scope.index)">删除
                 </el-button>
               </template>
               <template slot-scope="{ row }" slot="tenantName">
@@ -95,23 +46,9 @@
                 <el-tag>{{ row.userTypeName }}</el-tag>
               </template>
             </avue-crud>
-            <el-dialog
-              title="用户角色配置"
-              append-to-body
-              :visible.sync="roleBox"
-              :close-on-click-modal="false"
-              width="345px"
-            >
-              <el-tree
-                :data="roleGrantList"
-                show-checkbox
-                check-strictly
-                default-expand-all
-                node-key="id"
-                ref="treeRole"
-                :default-checked-keys="roleTreeObj"
-                :props="props"
-              >
+            <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" :close-on-click-modal="false" width="345px">
+              <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+                :default-checked-keys="roleTreeObj" :props="props">
               </el-tree>
 
               <span slot="footer" class="dialog-footer">
@@ -119,18 +56,8 @@
                 <el-button type="primary" @click="submitRole">确 定</el-button>
               </span>
             </el-dialog>
-            <el-dialog
-              title="用户数据导入"
-              append-to-body
-              :visible.sync="excelBox"
-              :close-on-click-modal="false"
-              width="555px"
-            >
-              <avue-form
-                :option="excelOption"
-                v-model="excelForm"
-                :upload-after="uploadAfter"
-              >
+            <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
+              <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
                 <template slot="excelTemplate">
                   <el-button type="primary" @click="handleTemplate">
                     点击下载<i class="el-icon-download el-icon--right"></i>
@@ -138,30 +65,13 @@
                 </template>
               </avue-form>
             </el-dialog>
-            <el-dialog
-              title="用户平台配置"
-              append-to-body
-              :visible.sync="platformBox"
-              :close-on-click-modal="false"
-            >
-              <avue-crud
-                :option="platformOption"
-                :table-loading="platformLoading"
-                :data="platformData"
-                ref="platformCrud"
-                v-model="platformForm"
-                :before-open="platformBeforeOpen"
-                :page.sync="platformPage"
-                :permission="platformPermissionList"
-                @row-update="platformRowUpdate"
-                @search-change="platformSearchChange"
-                @search-reset="platformSearchReset"
-                @selection-change="platformSelectionChange"
-                @current-change="platformCurrentChange"
-                @size-change="platformSizeChange"
-                @refresh-change="platformRefreshChange"
-                @on-load="platformOnLoad"
-              >
+            <el-dialog title="用户平台配置" append-to-body :visible.sync="platformBox" :close-on-click-modal="false">
+              <avue-crud :option="platformOption" :table-loading="platformLoading" :data="platformData" ref="platformCrud"
+                v-model="platformForm" :before-open="platformBeforeOpen" :page.sync="platformPage"
+                :permission="platformPermissionList" @row-update="platformRowUpdate" @search-change="platformSearchChange"
+                @search-reset="platformSearchReset" @selection-change="platformSelectionChange"
+                @current-change="platformCurrentChange" @size-change="platformSizeChange"
+                @refresh-change="platformRefreshChange" @on-load="platformOnLoad">
                 <template slot-scope="{ row }" slot="tenantName">
                   <el-tag>{{ row.tenantName }}</el-tag>
                 </template>
@@ -170,18 +80,8 @@
                 </template>
               </avue-crud>
             </el-dialog>
-            <el-dialog
-              title="导入商品"
-              append-to-body
-              :visible.sync="excelBox"
-              :close-on-click-modal="false"
-              width="555px"
-            >
-              <avue-form
-                :option="excelOption"
-                v-model="excelForm"
-                :upload-after="uploadAfter"
-              >
+            <el-dialog title="导入商品" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
+              <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
                 <template slot="excelTemplate">
                   <el-button type="primary" @click="derivation">
                     点击下载<i class="el-icon-download el-icon--right"></i>
@@ -192,17 +92,26 @@
                 温馨提示 第一次导入时请先下载模板
               </p>
             </el-dialog>
+            <el-dialog title="批量修改分管员" append-to-body :visible.sync="excelAdminProfiles" width="555px"
+              :close-on-click-modal="false" v-dialog-drag>
+              <avue-form :option="excelOptionAdminProfiles" v-model="excelAdminProfilesForm" table-loading="excelLoading"
+                :upload-before="uploadBeforeAdminProfiles" :upload-after="uploadAfterAdminProfiles">
+                <template slot="excelTemplate">
+                  <el-button type="primary" @click="derivationAdminProfiles">
+                    点击下载<i class="el-icon-download el-icon--right"></i>
+                  </el-button>
+                </template>
+              </avue-form>
+              <p style="text-align: center;color: #dc0505">
+                温馨提示 第一次导入时请先下载模板
+              </p>
+            </el-dialog>
           </basic-container>
         </el-col>
       </el-row>
     </div>
 
-    <detail-page
-      @goBack="goBack"
-      :detailData="detailData"
-      @copyOrder="copyOrder"
-      v-if="!show"
-    ></detail-page>
+    <detail-page @goBack="goBack" :detailData="detailData" @copyOrder="copyOrder" v-if="!show"></detail-page>
   </div>
 </template>
 <script>
@@ -245,6 +154,9 @@ export default {
       }
     };
     return {
+      excelLoading: false,
+      excelAdminProfiles: false,
+      excelAdminProfilesForm: {},
       isDisplayExport: false,
       show: true,
       detailData: {},
@@ -262,7 +174,7 @@ export default {
         pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       platformPage: {
         pageSize: 10,
@@ -284,7 +196,7 @@ export default {
       treeOption: {
         nodeKey: "id",
         lazy: true,
-        treeLoad: function(node, resolve) {
+        treeLoad: function (node, resolve) {
           console.log(node);
           const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree(parentId).then(res => {
@@ -408,6 +320,31 @@ export default {
             action: "/api/blade-client/goodsdesc/import-desc"
           }
         ]
+      },
+      excelOptionAdminProfiles: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24
+          },
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中,请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data"
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-client/goodsdesc/importGoods"
+          }
+        ]
       }
     };
   },
@@ -460,6 +397,23 @@ export default {
     }
   },
   methods: {
+    uploadAfterAdminProfiles(res, done, loading, column) {
+      this.excelAdminProfiles = false;
+      this.$message.success("导入成功!");
+      this.refreshChange();
+      loading = false;
+      done();
+    },
+    uploadBeforeAdminProfiles(file, done, loading) {
+      done();
+      loading = true;
+    },
+    derivationAdminProfiles() {
+      window.open(
+        `/api/blade-client/goodsdesc/exportAdminProfiles?${this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
     // 导出
     dataListExport() {
       let data = this.query
@@ -482,8 +436,7 @@ export default {
     },
     derivation() {
       window.open(
-        `/api/blade-client/goodsdesc/export-template?${
-          this.website.tokenHeader
+        `/api/blade-client/goodsdesc/export-template?${this.website.tokenHeader
         }=${getToken()}`
       );
     },
@@ -665,8 +618,7 @@ export default {
     },
     handleTemplate() {
       window.open(
-        `/api/blade-user/export-template?${
-          this.website.tokenHeader
+        `/api/blade-user/export-template?${this.website.tokenHeader
         }=${getToken()}`
       );
     },

+ 7 - 6
src/views/iosBasicData/accounts/index.vue

@@ -199,7 +199,7 @@ import {
               overHidden: true,
               search: true,
               type:'select',
-                width: "35",
+                width: "50",
               dicData:[
                   {
                       label:'否',
@@ -224,7 +224,7 @@ import {
             //   overHidden: true,
             //   search: true,
             //   type:'select',
-            //     width: "35",
+            //     width: "50",
             //   dicData:[
             //       {
             //           label:'否',
@@ -242,7 +242,7 @@ import {
               overHidden: true,
               search: true,
               type:'select',
-                width: "35",
+                width: "50",
               dicData:[
                   {
                       label:'否',
@@ -260,7 +260,7 @@ import {
               overHidden: true,
               search: true,
               type:'select',
-                width: "35",
+                width: "50",
               dicData:[
                   {
                       label:'否',
@@ -278,7 +278,7 @@ import {
               overHidden: true,
               search: true,
               type:'select',
-                width: "35",
+                width: "50",
               dicData:[
                   {
                       label:'否',
@@ -296,7 +296,7 @@ import {
             //   overHidden: true,
             //   search: true,
             //   type:'select',
-            //     width: "35",
+            //     width: "50",
             //   dicData:[
             //       {
             //           label:'否',
@@ -314,6 +314,7 @@ import {
                 overHidden: true,
                 search: true,
                 type:'select',
+                width: "120",
                 dicData:[
                     {
                         label:'否',

+ 5 - 3
src/views/iosBasicData/accountsDetails/index.vue

@@ -459,7 +459,7 @@ export default {
   },
   methods: {
     showHight() {
-      this.$refs.crud.getTableHeight();
+      // this.$refs.crud.getTableHeight();
     },
     nodeClick(data) {
       this.getList(data)
@@ -626,11 +626,13 @@ export default {
 }
 
 .treeStyle {
-  height: 57vh;
+  height: 56vh;
+  margin-bottom: 60px;
   /* overflow-y: scroll; */
 }
 
 .bigTreeStyle {
-  height: 74vh;
+  height: 72vh;
+  margin-bottom: 60px;
 }
 </style>

+ 2 - 2
src/views/iosBasicData/decisionAnalysis/index.vue

@@ -80,6 +80,7 @@ export default {
                 searchIcon: true,
                 searchIndex: 3,
                 searchLabelWidth: "80",
+                dialogClickModal: false,
                 column: [
                     {
                         label: "业务来源",
@@ -662,8 +663,7 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(372), this.optionBack)
-
-        this.option.height = window.innerHeight - 370;
+        // this.option.height = window.innerHeight - 370;
     },
     methods: {
         rowCell(row) {

+ 15 - 11
src/views/iosBasicData/fingenlegcalc/index.vue

@@ -4,9 +4,11 @@
       <avue-form :option="optionForm" v-model="query" class="form-mb">
         <tempalte slot="button" slot-scope="{ row }">
           <span style="display: flex;justify-content: end;">
-            <el-button icon="el-icon-arrow-down" size="small" @click="searchShow = true, showHight()" v-if="!searchShow">展
+            <el-button icon="el-icon-arrow-down" size="small" @click="searchShow = true, showHight('展开')"
+              v-if="!searchShow">展
               开</el-button>
-            <el-button icon="el-icon-arrow-up" size="small" @click="searchShow = false, showHight()" v-if="searchShow">收
+            <el-button icon="el-icon-arrow-up" size="small" @click="searchShow = false, showHight('收缩')"
+              v-if="searchShow">收
               缩</el-button>
             <!-- <el-button type="primary" size="small" plain @click="inItial">初始入账
             </el-button> -->
@@ -426,8 +428,8 @@ export default {
     })
   },
   methods: {
-    showHight() {
-      this.$refs.crud.getTableHeight();
+    showHight(type) {
+      // this.$refs.crud.getTableHeight();
     },
     nodeClick(data) {
       this.getList(data)
@@ -459,11 +461,11 @@ export default {
     },
     //重置特殊值
     resetData() {
-      this.query.displayAcc = this.query.checkbox.find(e=>e=='displayAcc')?1:0
-      this.query.foreignCurrency =this.query.checkbox.find(e=>e=='foreignCurrency')?1:0
-      this.query.blcNotZero = this.query.checkbox.find(e=>e=='blcNotZero')?1:0
-      this.query.noAmountIncurred = this.query.checkbox.find(e=>e=='noAmountIncurred')?1:0
-      this.query.doNotDisplayYear = this.query.checkbox.find(e=>e=='doNotDisplayYearc')?1:0
+      this.query.displayAcc = this.query.checkbox.find(e => e == 'displayAcc') ? 1 : 0
+      this.query.foreignCurrency = this.query.checkbox.find(e => e == 'foreignCurrency') ? 1 : 0
+      this.query.blcNotZero = this.query.checkbox.find(e => e == 'blcNotZero') ? 1 : 0
+      this.query.noAmountIncurred = this.query.checkbox.find(e => e == 'noAmountIncurred') ? 1 : 0
+      this.query.doNotDisplayYear = this.query.checkbox.find(e => e == 'doNotDisplayYearc') ? 1 : 0
     },
     //导出
     outExport() {
@@ -589,11 +591,13 @@ export default {
 }
 
 .treeStyle {
-  height: 61vh;
+  height: 59vh;
+  margin-bottom: 61px;
   /* overflow-y: scroll; */
 }
 
 .bigTreeStyle {
-  height: 74vh;
+  height: 72vh;
+  margin-bottom: 60px;
 }
 </style>

+ 1 - 1
src/views/iosBasicData/finvouchers/finvouchersitems.vue

@@ -38,7 +38,7 @@
                         <el-col :span="6">
                             <el-form-item label="凭证日期" prop="voucherDate">
                                 <el-date-picker v-model="form.voucherDate" clearable style="width: 100%;" type="date"
-                                    size="small" value-format="yyyy-MM-dd HH:mm" :disabled="form.voucherStatus == 1"
+                                    size="small" value-format="yyyy-MM-dd" :disabled="form.voucherStatus == 1"
                                     placeholder="选择凭证日期">
                                 </el-date-picker>
                             </el-form-item>

+ 10 - 0
src/views/iosBasicData/periodManagement/detailsPage.vue

@@ -138,6 +138,16 @@ export default {
                         spinner: 'el-icon-loading',
                         background: 'rgba(255,255,255,0.7)'
                     });
+                    this.form.accItems.forEach(item => {
+                        item.selected = 'false'
+                    })
+                    this.selectionList.forEach(e => {
+                        this.form.accItems.forEach(item => {
+                            if (item.id == e.id) {
+                                item.selected = 'true'
+                            }
+                        })
+                    })
                     let obj = {
                         ...this.bigObj,
                         periodVouchersTemplate: this.form

+ 24 - 14
src/views/iosBasicData/periodManagement/index.vue

@@ -114,7 +114,7 @@ export default {
     },
     data() {
         return {
-            itemId:null,
+            itemId: null,
             dialogOption: {
                 viewBtn: false,
                 editBtn: false,
@@ -373,11 +373,11 @@ export default {
                         overHidden: true,
                         search: true,
                         dicData: [
-                            {
-                                label: '未结转',
+                        {
+                                label: '未生成',
                                 value: 0,
                             }, {
-                                label: '已结转',
+                                label: '已生成',
                                 value: 1,
                             }
                         ]
@@ -433,10 +433,10 @@ export default {
                         overHidden: true,
                         dicData: [
                             {
-                                label: '未结转',
+                                label: '未生成',
                                 value: 0,
                             }, {
-                                label: '已结转',
+                                label: '已生成',
                                 value: 1,
                             }
                         ]
@@ -455,13 +455,13 @@ export default {
                 path: '/api/blade-los/finperiod/export',      //跳转目标窗口的地址
                 query: {
                     'Blade-Auth': getToken(),
-                    'id':this.itemId,
+                    'id': this.itemId,
                 }
             })
             window.open(routeData.href.slice(1, routeData.href.length));
-            if(type==1){
+            if (type == 1) {
                 this.handleClose3()
-            }else{
+            } else {
                 this.handleClose4()
             }
         },
@@ -477,12 +477,12 @@ export default {
                         if (res.data.msg == '审核未通过') {
                             this.loading = false
                             this.openDialog2 = true
-                            this.itemId=row.id
+                            this.itemId = row.id
                             this.dialogData = res.data.data
                         } else if (res.data.msg == '凭证未记账') {
                             this.loading = false
                             this.openDialog3 = true
-                            this.itemId=row.id
+                            this.itemId = row.id
                             this.dialogData2 = res.data.data
                         } else {
                             this.loading = false
@@ -491,6 +491,8 @@ export default {
 
                         }
 
+                    }).finally(() => {
+                        this.loading = false
                     })
                 })
             } else {
@@ -504,6 +506,8 @@ export default {
                         this.loading = false
                         this.$message.success("撤销锁定");
                         this.handleClick(this.activeName)
+                    }).finally(() => {
+                        this.loading = false
                     })
                 })
             }
@@ -520,6 +524,8 @@ export default {
                         this.loading = false
                         this.$message.success("结转成功");
                         this.handleClick(this.activeName)
+                    }).finally(() => {
+                        this.loading = false
                     })
                 })
             } else {
@@ -533,6 +539,8 @@ export default {
                         this.loading = false
                         this.$message.success("反结转成功");
                         this.handleClick(this.activeName)
+                    }).finally(() => {
+                        this.loading = false
                     })
                 })
             }
@@ -545,10 +553,12 @@ export default {
             }).then(() => {
                 this.loading = true
                 open({ beginDate: this.openDate }).then(res => {
-                    this.loading = false
+
                     this.$message.success("开账成功");
                     this.handleClick(this.activeName)
                     this.handleClose()
+                }).finally(() => {
+                    this.loading = false
                 })
             })
         },
@@ -562,12 +572,12 @@ export default {
             this.itemOpenDialog = false
         },
         handleClose3() {
-            this.itemId=null
+            this.itemId = null
             this.dialogData = []
             this.openDialog2 = false
         },
         handleClose4() {
-            this.itemId=null
+            this.itemId = null
             this.dialogData2 = []
             this.openDialog3 = false
         },

+ 39 - 0
src/views/tirePartsMall/inventory/index.vue

@@ -318,6 +318,18 @@ export default {
             label: '品牌',
             prop: 'brandName'
           }, {
+            label: '合计',
+            prop: 'goodsSizeTotal'
+          }, {
+            label: '12',
+            prop: 'goodsSize12'
+          }, {
+            label: '13',
+            prop: 'goodsSize13'
+          }, {
+            label: '14',
+            prop: 'goodsSize14'
+          }, {
             label: '15',
             prop: 'goodsSize15'
           }, {
@@ -333,6 +345,33 @@ export default {
             label: '19',
             prop: 'goodsSize19'
           }, {
+            label: '20',
+            prop: 'goodsSize20'
+          }, {
+            label: '21',
+            prop: 'goodsSize21'
+          }, {
+            label: '22',
+            prop: 'goodsSize22'
+          }, {
+            label: '23',
+            prop: 'goodsSize23'
+          }, {
+            label: '24',
+            prop: 'goodsSize24'
+          }, {
+            label: '25',
+            prop: 'goodsSize25'
+          }, {
+            label: '26',
+            prop: 'goodsSize26'
+          }, {
+            label: '27',
+            prop: 'goodsSize27'
+          }, {
+            label: '28',
+            prop: 'goodsSize28'
+          }, {
             label: '其它',
             prop: 'goodsSizeOther'
           }

+ 2 - 2
src/views/tirePartsMall/purchaseService/Task/index.vue

@@ -366,8 +366,8 @@ export default {
     rowCell(row,index){
       this.findObject(this.option.column, "storageName").cell = true
       this.findObject(this.optionList.column, "storageName").cell = true
-      this.findObject(this.option.column, "stockClerkId").cell = true
-      this.findObject(this.optionList.column, "stockClerkId").cell = true
+      this.findObject(this.option.column, "stockClerkName").cell = true
+      this.findObject(this.optionList.column, "stockClerkName").cell = true
       this.findObject(this.option.column, "remarks").cell = true
       this.findObject(this.optionList.column, "remarks").cell = true
       this.$refs.crud.rowCell(row, index)

+ 2 - 2
src/views/tirePartsMall/salesManagement/inboundTask/index.vue

@@ -374,8 +374,8 @@ export default {
     rowCell(row,index){
       this.findObject(this.option.column, "storageName").cell = true
       this.findObject(this.optionList.column, "storageName").cell = true
-      this.findObject(this.option.column, "stockClerkId").cell = true
-      this.findObject(this.optionList.column, "stockClerkId").cell = true
+      this.findObject(this.option.column, "stockClerkName").cell = true
+      this.findObject(this.optionList.column, "stockClerkName").cell = true
       this.findObject(this.option.column, "remarks").cell = true
       this.findObject(this.optionList.column, "remarks").cell = true
       this.$refs.crud.rowCell(row, index)

+ 2 - 2
src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -360,8 +360,8 @@ export default {
     rowCell(row,index){
       this.findObject(this.option.column, "storageName").cell = true
       this.findObject(this.optionList.column, "storageName").cell = true
-      this.findObject(this.option.column, "stockClerkId").cell = true
-      this.findObject(this.optionList.column, "stockClerkId").cell = true
+      this.findObject(this.option.column, "stockClerkName").cell = true
+      this.findObject(this.optionList.column, "stockClerkName").cell = true
       this.findObject(this.option.column, "remarks").cell = true
       this.findObject(this.optionList.column, "remarks").cell = true
       this.$refs.crud.rowCell(row, index)

+ 2 - 2
src/views/tirePartsMall/salesService/Task/index.vue

@@ -353,8 +353,8 @@ export default {
     rowCell(row,index){
       this.findObject(this.option.column, "storageName").cell = true
       this.findObject(this.optionList.column, "storageName").cell = true
-      this.findObject(this.option.column, "stockClerkId").cell = true
-      this.findObject(this.optionList.column, "stockClerkId").cell = true
+      this.findObject(this.option.column, "stockClerkName").cell = true
+      this.findObject(this.optionList.column, "stockClerkName").cell = true
       this.findObject(this.option.column, "remarks").cell = true
       this.findObject(this.optionList.column, "remarks").cell = true
       this.$refs.crud.rowCell(row, index)