Explorar el Código

押金管理退押列表调整

FengChaoYu hace 3 años
padre
commit
53a4eb1878

+ 19 - 9
src/views/deposit_commerce/refund_list.vue

@@ -139,12 +139,9 @@
 
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="格力内部备注" prop="refFactoryNo">
-
-                  <el-input v-model="screenForm.refFactoryNo"></el-input>
-
+                <el-form-item label="格力内部备注" prop="geLiInerNote">
+                  <el-input v-model="screenForm.geLiInerNote"></el-input>
                 </el-form-item>
-
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="厂编号" prop="factoryNo">
@@ -234,6 +231,16 @@
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.submitTime}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.checkDate}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
@@ -256,7 +263,7 @@
             </el-table-column>
             <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refTradeCategory" />
                 <span>{{scope.row.refTradeCategory}}</span>
@@ -276,7 +283,11 @@
                 <span>{{scope.row.refRegionWork}}</span>
               </template>
             </el-table-column>
-
+            <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.geLiInerNote}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />
@@ -391,10 +402,9 @@ export default {
         refRegionWork: "",
         endSubmitTime: "",
         refTradeCategory: "",
-        refFactoryNo: "",
-        factoryNo: "",
         startAcceptTime: "",
         endAcceptTime: "",
+        geLiInerNote:'',
       }, // 搜索表单
       refundDepositArr: [
         {

+ 160 - 154
src/views/deposit_home/deposit_list.vue

@@ -2,8 +2,8 @@
   <div class="app-container">
     <div v-if="showPage == 1">
       <el-radio-group v-model="deduction" size="mini" @change="handleRadio">
-        <el-radio-button label="全部" />
-        <el-radio-button label="已退押" />
+        <el-radio-button label="全部"/>
+        <el-radio-button label="已退押"/>
       </el-radio-group>
       <br><br>
       <!-- 筛选条件 -->
@@ -57,70 +57,66 @@
               <el-form-item label="开始申请日期" prop="startSubmitTime">
                 <el-date-picker
                   v-model="screenForm.startSubmitTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-         <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束申请日期" prop="endSubmitTime">
                 <el-date-picker
                   v-model="screenForm.endSubmitTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  clearable placeholder="请选择是否退押 " >
-
-
-                <el-option v-for="item in refundDepositArr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+                <el-select style="width:100%" v-model="screenForm.isRefundDeposit" clearable placeholder="请选择是否退押 ">
+                  <el-option v-for="item in refundDepositArr"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-         <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-              <el-select style="width:100%" v-model="screenForm.examineStatus"  clearable placeholder="请选择状态 " >
-
-
-                <el-option v-for="item in examineStatusArr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+                <el-select style="width:100%" v-model="screenForm.examineStatus" clearable placeholder="请选择状态 ">
+                  <el-option v-for="item in examineStatusArr"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -133,8 +129,8 @@
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-              <template v-if="!isCustomer">
-                <el-col :xs="24" :sm="12" :lg="6">
+            <template v-if="!isCustomer">
+              <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="审核人" prop="confirmName">
                   <el-input
                     v-model="screenForm.confirmName"
@@ -151,110 +147,109 @@
                 </el-form-item>
               </el-col>
 
-                   <el-col :xs="24" :sm="12" :lg="6">
+              <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="安装日期" style="margin-bottom:0">
                   <div class="fanwei">
-                     <el-form-item prop="startInstallTime">
-                          <el-date-picker
-                  v-model="screenForm.startInstallTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                    <el-form-item prop="startInstallTime">
+                      <el-date-picker
+                        v-model="screenForm.startInstallTime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
 
-                     </el-form-item>
-                      <span>-</span>
+                    </el-form-item>
+                    <span>-</span>
                     <el-form-item prop="endInstallTime">
-                                 <el-date-picker
-                  v-model="screenForm.endInstallTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                      <el-date-picker
+                        v-model="screenForm.endInstallTime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
 
-                     </el-form-item>
+                    </el-form-item>
                   </div>
                 </el-form-item>
               </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
+              <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="规格型号" prop="specification">
-                        <el-input  v-model="screenForm.specification" placeholder="请输入规格型号" ></el-input>
+                  <el-input v-model="screenForm.specification" placeholder="请输入规格型号"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="特价编号" prop="specialNo">
+                <el-form-item label="特价编号" prop="specialNo">
 
-                        <el-input  v-model="screenForm.specialNo" placeholder="请输入特价编号" ></el-input>
+                  <el-input v-model="screenForm.specialNo" placeholder="请输入特价编号"></el-input>
 
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                <el-form-item label="跨区厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号" ></el-input>
+                  <el-input v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号"></el-input>
 
                 </el-form-item>
 
               </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="格力内部备注" prop="geLiInerNote">
-
-                        <el-input  v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注" ></el-input>
-
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="格力内部备注" prop="geLiInerNote">
+                  <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
                 </el-form-item>
-
               </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="厂编号" prop="factoryNo">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" prop="factoryNo">
 
-                  <el-input  v-model="screenForm.factoryNo" placeholder="请输入厂编号" ></el-input>
+                  <el-input v-model="screenForm.factoryNo" placeholder="请输入厂编号"></el-input>
 
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="资料审核开始日期" prop="startAcceptTime">
-                <el-date-picker
-                  v-model="screenForm.startAcceptTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="资料审核结束日期" prop="endAcceptTime">
-                <el-date-picker
-                  v-model="screenForm.endAcceptTime"
-                   value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
+                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                  <el-date-picker
+                    v-model="screenForm.startAcceptTime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    class="dateStyle"
+                    type="datetime"
+                    placeholder="选择日期"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                  <el-date-picker
+                    v-model="screenForm.endAcceptTime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    class="dateStyle"
+                    type="datetime"
+                    placeholder="选择日期"
+                  />
+                </el-form-item>
+              </el-col>
 
-              </template>
+            </template>
             <el-col :xs="24" :sm="24" :lg="24">
-    <div class="fl">
-          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-            <el-radio-button label="HOME">家用工程</el-radio-button>
-            <el-radio-button label="TRADE">商用工程</el-radio-button>
-          </el-radio-group> -->
-          <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
-        </div>
+              <div class="fl">
+                <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+                  <el-radio-button label="HOME">家用工程</el-radio-button>
+                  <el-radio-button label="TRADE">商用工程</el-radio-button>
+                </el-radio-group> -->
+                <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
+              </div>
               <el-form-item label="" class="fr">
                 <el-button
                   size="mini"
                   @click="resetScreenForm"
-                >清空</el-button>
+                >清空
+                </el-button>
                 <el-button
                   size="mini"
                   type="primary"
                   @click="submitScreenForm"
-                >搜索</el-button>
+                >搜索
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -266,7 +261,8 @@
           type="primary"
           size="mini"
           @click="hanleDownloadFiles"
-        >导出</el-button>
+        >导出
+        </el-button>
         <el-upload
           v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
@@ -294,7 +290,7 @@
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionAllChange"
           >
-            <el-table-column align="left" type="selection" width="55" />
+            <el-table-column align="left" type="selection" width="55"/>
             <el-table-column
               align="left"
               label="工程登录编号"
@@ -309,14 +305,14 @@
               min-width="160"
               show-overflow-tooltip
             />
-             <el-table-column
+            <el-table-column
               align="left"
               label="申请日期"
               prop="submitTime"
               min-width="160"
               show-overflow-tooltip
             />
-             <el-table-column
+            <el-table-column
               align="left"
               label="受理日期"
               prop="checkDate"
@@ -331,7 +327,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.customerNumber" />
+                <CopyButton :copy-text="scope.row.customerNumber"/>
                 <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
@@ -343,11 +339,11 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.customerName" />
+                <CopyButton :copy-text="scope.row.customerName"/>
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-              <el-table-column
+            <el-table-column
               align="left"
               label="规格型号"
               prop="specification"
@@ -355,7 +351,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.specification" />
+                <CopyButton :copy-text="scope.row.specification"/>
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
@@ -371,7 +367,8 @@
                   v-if="scope.row.isRefundDeposit"
                   type="success"
                   size="small"
-                >是</el-tag>
+                >是
+                </el-tag>
                 <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
@@ -418,17 +415,20 @@
                   v-if="scope.row.examineStatus == 'OK'"
                   type="warning"
                   size="mini"
-                >通过</el-tag>
+                >通过
+                </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'FAIL'"
                   type="warning"
                   size="small"
-                >不通过</el-tag>
+                >不通过
+                </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'CLOSE'"
                   type="warning"
                   size="small"
-                >关闭</el-tag>
+                >关闭
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -438,7 +438,7 @@
               min-width="160"
               show-overflow-tooltip
             />
-              <el-table-column
+            <el-table-column
               align="left"
               label="资料审核日期"
               prop="refDatumAcceptDate"
@@ -458,7 +458,8 @@
                   class="textColor"
                   size="mini"
                   @click="detailFn(scope.row)"
-                >详情</el-button>
+                >详情
+                </el-button>
                 <el-button
                   v-if="
                     scope.row.examineStatus == 'SAVE' &&
@@ -467,7 +468,8 @@
                   type="text"
                   class="textColor"
                   @click="surrenderFn(scope.row)"
-                >申请退押</el-button>
+                >申请退押
+                </el-button>
                 <!-- <el-button type="text" class="textColor" slot="reference"
                   >免扣退押</el-button
                 > -->
@@ -489,9 +491,9 @@
         </div>
       </div>
     </div>
-    <DepositListDetail v-else-if="showPage == 2" />
-    <DepositApplyDeduction v-else-if="showPage == 3" />
-    <DepositApplySurrender v-else-if="showPage == 4" />
+    <DepositListDetail v-else-if="showPage == 2"/>
+    <DepositApplyDeduction v-else-if="showPage == 3"/>
+    <DepositApplySurrender v-else-if="showPage == 4"/>
   </div>
 </template>
 
@@ -502,8 +504,8 @@ import {
 } from "@/api/engin_deposit/refund_list";
 import DepositApplyDeduction from './components/deposit-apply-deduction.vue'
 import DepositApplySurrender from './components/deposit-apply-surrender.vue'
-import { downloadFiles, handleImport } from '@/utils/util'
-import { getList } from '@/api/engin_deposit.js'
+import {downloadFiles, handleImport} from '@/utils/util'
+import {getList} from '@/api/engin_deposit.js'
 import Mixin from '@/mixin'
 
 export default {
@@ -532,20 +534,21 @@ export default {
         refTradeCategory: '',
         refUseUnit: '', // 使用单位
         startDeliverTime: '', // 发货申请日期-开始
-        startSubmitTime:'',
-        startConfirmTime:'',
-        isRefundDeposit:null,
-        endConfirmTime:'',
-        startInstallTime:'',
-        endInstallTime:'',
-        specification:'',
-        refFactoryNo:'',
-        factoryNo:'',
-        specialNo:'',
-        refRegionWork:'',
-        endSubmitTime:'',
-        startAcceptTime:'',    endAcceptTime:'',
-        geLiInerNote:'',factoryNo:''
+        startSubmitTime: '',
+        startConfirmTime: '',
+        isRefundDeposit: null,
+        endConfirmTime: '',
+        startInstallTime: '',
+        endInstallTime: '',
+        specification: '',
+        refFactoryNo: '',
+        factoryNo: '',
+        specialNo: '',
+        refRegionWork: '',
+        endSubmitTime: '',
+        startAcceptTime: '',
+        endAcceptTime: '',
+        geLiInerNote: '',
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -553,44 +556,44 @@ export default {
       importFileList: [],
       selectData: [],
       baseURL: '',
-      refundDepositArr:[
+      refundDepositArr: [
         {
-          label:'是',
-          value:true
+          label: '是',
+          value: true
         },
         {
-          label:'否',
-          value:false
+          label: '否',
+          value: false
         }
       ],
 
-      examineStatusArr:[
-         {
-          label:'保存',
-          value:'SAVE'
+      examineStatusArr: [
+        {
+          label: '保存',
+          value: 'SAVE'
         },
         {
-          label:'待审核',
-          value:'WAIT'
+          label: '待审核',
+          value: 'WAIT'
         },
         {
-          label:'通过',
-          value:'OK'
+          label: '通过',
+          value: 'OK'
         },
         {
-          label:'关闭',
-          value:'CLOSE'
+          label: '关闭',
+          value: 'CLOSE'
         },
       ]
     }
   },
-  computed:{
-    isCustomer(){
+  computed: {
+    isCustomer() {
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     }
   },
   methods: {
-      //同步资料日期
+    //同步资料日期
     async syncDateFn() {
       await getDepositManageDate();
       this.$message.success("同步资料日期成功");
@@ -619,9 +622,9 @@ export default {
         ...this.screenForm
       }
       params.isRefundDeposit = this.deduction === '已退押' ? true : ''
-    if (this.screenForm.isRefundDeposit == true || this.screenForm.isRefundDeposit == false ) {
-      params.isRefundDeposit =this.screenForm.isRefundDeposit
-    }
+      if (this.screenForm.isRefundDeposit == true || this.screenForm.isRefundDeposit == false) {
+        params.isRefundDeposit = this.screenForm.isRefundDeposit
+      }
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {
@@ -642,7 +645,7 @@ export default {
         for (let i = 0; i < this.selectData.length; i++) {
           arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles('/deposit-manage/export', { id: arr, orderType:'HOME' })
+        downloadFiles('/deposit-manage/export', {id: arr, orderType: 'HOME'})
       } else {
         this.$errorMsg('请选择押金项')
       }
@@ -684,13 +687,16 @@ export default {
   span {
     margin: 0 20px;
   }
-  div{
-    width:100%
+
+  div {
+    width: 100%
   }
 }
+
 .dateStyle {
   width: 100%;
 }
+
 .import-btn {
   margin-left: 10px;
 }

+ 19 - 9
src/views/deposit_home/refund_list.vue

@@ -140,12 +140,9 @@
               </el-col>
 
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="格力内部备注" prop="refFactoryNo">
-
-                  <el-input v-model="screenForm.refFactoryNo"></el-input>
-
+                <el-form-item label="格力内部备注" prop="geLiInerNote">
+                  <el-input v-model="screenForm.geLiInerNote"></el-input>
                 </el-form-item>
-
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="厂编号" prop="factoryNo">
@@ -235,6 +232,16 @@
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.submitTime}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.checkDate}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
@@ -257,7 +264,7 @@
             </el-table-column>
             <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refTradeCategory" />
                 <span>{{scope.row.refTradeCategory}}</span>
@@ -277,7 +284,11 @@
                 <span>{{scope.row.refRegionWork}}</span>
               </template>
             </el-table-column>
-
+            <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.geLiInerNote}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />
@@ -392,10 +403,9 @@ export default {
         refRegionWork: "",
         endSubmitTime: "",
         refTradeCategory: "",
-        refFactoryNo: "",
-        factoryNo: "",
         startAcceptTime: "",
         endAcceptTime: "",
+        geLiInerNote:'',
       }, // 搜索表单
       refundDepositArr: [
         {