Finish Hotfix-zh-292

src/api/engin_deposit/refund_list.js

@@ -63,3 +63,14 @@ export function getCommonFileGetStream(params) {
     params,
   });
 }
+
+
+
+// 批量审核家用
+export function examineData(params) {
+  return request({
+    url: "/deposit-manage/bach-condition-examine-home",
+    method: "get",
+    params,
+  });
+}

src/api/finance/rebate_list.js

@@ -79,6 +79,14 @@ export function getRebateOrderExamineBatch(params) {
     params,
   });
 }
+// 批量复核
+export function getRebateOrderExamine2Batch(params) {
+  return request({
+    url: "/rebate/order/examine2/batch",
+    method: "post",
+    params,
+  });
+}
 // 复核前-编辑
 export function getRebateOrderAclUpdate(data) {
   return request({

src/mixin/print.js

@@ -300,7 +300,7 @@ export default {
           const newInvoicePickBeans = invoicePickBeans.splice(0, 5);
           for (let e = newInvoicePickBeans.length; e > 0; e--) {
             const tempData = newInvoicePickBeans[e - 1];
-            total += +tempData.refundableQty
+            total += Math.abs(+tempData.refundableQty)
             //添加表格数据
             table.push({
               id: tempData.id,

src/views/basic_data/dealer/dealer_stock.vue

@@ -54,6 +54,12 @@
               <span>{{scope.row.customerName}}</span>
             </template>
           </el-table-column>
+          <el-table-column align="left" label="金蝶部门编号" prop="k3OrgNumber" min-width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.k3OrgNumber" />
+              <span>{{scope.row.k3OrgNumber}}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="left" label="钱包名称" prop="customerWalletName" min-width="200" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="业务员" prop="serviceName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="创建人" prop="createBy" min-width="180" show-overflow-tooltip></el-table-column>
@@ -86,12 +92,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="经销商编码" prop="">
+        <el-form-item label="经销商编码" prop="customerNumber">
           <el-input disabled v-model="addForm.customerNumber"></el-input>
           <!-- <template slot-scope="scope">
             {{ scope.row }}
           </template> -->
         </el-form-item>
+        <el-form-item label="金蝶部门编号" prop="k3OrgNumber">
+          <el-input  v-model="addForm.k3OrgNumber"></el-input>
+          <!-- <template slot-scope="scope">
+            {{ scope.row }}
+          </template> -->
+        </el-form-item>
         <el-form-item label="钱包" prop="customerWalletId">
           <el-select class="selectStyle" v-model="addForm.customerWalletId" placeholder="请选择" filterable>
             <el-option v-for="item in walletList" :key="item.customerWalletId" :label="item.customerWalletName" :value="item.customerWalletId">
@@ -218,6 +230,7 @@ export default {
         customerId: "",
         customerName: "",
         customerNumber: "",
+        k3OrgNumber:"",
         region: [],
         // oneParentId: "",
         // twoParentId: "",
@@ -384,7 +397,7 @@ export default {
         res.data.adminWebsitId3,
       ];
       this.addForm.serviceId = res.data.serviceId;
-
+      this.addForm.k3OrgNumber = res.data.k3OrgNumber
       this.dialogForm = true;
     },
     //获取业务员数据
@@ -486,7 +499,7 @@ export default {
         customerNumber: this.addForm.customerNumber,
         customerWalletId: this.addForm.customerWalletId,
         customerWalletName: data2[0].customerWalletName,
-
+        k3OrgNumber:this.addForm.k3OrgNumber,
         serviceId: this.addForm.serviceId,
         serviceName: data3[0].nickName,
       };
@@ -508,6 +521,8 @@ export default {
       this.addForm.customerName = "";
       this.addForm.customerWalletId = "";
       this.addForm.region = [];
+      this.addForm.k3OrgNumber = ''
+
       // this.addForm.oneParentId = "";
       // this.addForm.twoParentId = "";
       // this.addForm.threeParentId = "";
@@ -533,6 +548,7 @@ export default {
       this.addForm.customerNumber = "";
       this.addForm.customerWalletId = "";
       this.addForm.region = [];
+      this.addForm.k3OrgNumber = ''
       // this.addForm.oneParentId = "";
       // this.addForm.twoParentId = "";
       // this.addForm.threeParentId = "";

src/views/basic_data/material/price_list.vue

@@ -150,7 +150,7 @@
         <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
       <div class="fl">
-        
+
         </div>
     </div>
     <div class="mymain-container">
@@ -162,11 +162,11 @@
           element-loading-text="Loading"
           border
           fit
-       
+
           :row-class-name="tableRowClassName"
           @select-all="hanleSelectAll"
           @select="hanleSelectAll"
-         
+
         >
            <el-table-column
               type="selection"
@@ -470,7 +470,7 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
-      getTypeList(params).then((res) => {
+      getTypeList({...params,pageNum:1,pageSize:-1}).then((res) => {
         this.ztypeList = res.data.records
         // console.log(this.ztypeList, "type1111");
       })
@@ -482,10 +482,15 @@ export default {
       })
     },
     handleRevokeAll() {
-      handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
+      if (this.ids.length) {
+        handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
         this.$successMsg('操作成功')
         this.getList()
       })
+      }else{
+        this.$errorMsg('请选择')
+      }
+
     },
     tableRowClassName({row, rowIndex}) {
       // || row.examineStatus=='FAIL'

src/views/basic_data/stock/customer_product_list.vue

@@ -176,7 +176,7 @@
           </el-table-column>
           <el-table-column
             align="right"
-            label="可用单数量"
+            label="可开单数量"
             prop="openNumber"
             min-width="100"
             show-overflow-tooltip

src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -440,8 +440,8 @@ export default {
               arr.push(item)
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ['hasSendQty', 'dataQty', 'qty']
-        item.sums2 = ['totalAmount', 'diffAmount', 'price']
+        item.sums1 = ['hasSendQty', 'dataQty', 'qty',"hasSendQty"]
+        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
       })
       res.data.items = arr
       this.details = res.data

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -908,8 +908,8 @@ export default {
               arr.push(item)
             }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
-            item.sums2 = ['totalAmount', 'diffAmount', 'price']
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty"]
+            item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
           })
           res.data.items = arr
           this.details = res.data

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -169,6 +169,13 @@
           </div>
 
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">备注</div>
+          <!-- <div class="value">{{ detailList.applyNote }}</div> -->
+          <div class="value">
+            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.remark" placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
@@ -320,6 +327,22 @@
                 {{ scope.row.depositAmount | numToFixed}}
             </template>
             </el-table-column>
+            <!-- <el-table-column
+              align="right"
+              label="合同价格"
+              prop="contractPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+              <template v-if="detailList.examineStatus !== 'WAIT'" >
+                {{scope.row.contractPrice}}
+              </template>
+              <el-input v-else class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+
+            </template>
+
+            </el-table-column> -->
             <el-table-column
               align="right"
               label="上交资料"
@@ -736,8 +759,8 @@ export default {
               arr.push(item)
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
-        item.sums2 = ["totalAmount", "diffAmount", "price"];
+        item.sums1 = ["orderHasSendQty", "dataQty", "qty","hasSendQty"];
+        item.sums2 = ["totalAmount", "diffAmount", "price",'depositAmount'];
       });
       res.data.items = arr
       this.detailList = res.data;
@@ -757,6 +780,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+    .inpt{
+    ::v-deep .el-input__inner{
+      text-align: right ;
+
+    }
+}
 .aaa {
   height: 64px;
   width: 64px;

src/views/deposit_commerce/deposit_list.vue

@@ -205,10 +205,26 @@
                 </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="factoryNo">
                   <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="厂编号" style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startFactoryNo">
+                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endFactoryNo">
+
+                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="资料审核开始日期" prop="startAcceptTime">
@@ -240,7 +256,7 @@
             <el-radio-button label="TRADE">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
-          <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
+          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
         </div>
               <el-form-item label="" class="fr">
                 <el-button
@@ -569,7 +585,9 @@ export default {
         endSubmitTime:''
         ,
         startAcceptTime:'',    endAcceptTime:'',
-        geLiInerNote:'',factoryNo:''
+        geLiInerNote:'',factoryNo:'',
+        startFactoryNo:'',
+        endFactoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -651,7 +669,7 @@ export default {
         res.data.records.forEach((item) => {
           item.totalPrice = item.itemPrice * item.itemQty
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-          item.sums1 = ['qty','hasSendQty','itemDataQty']
+          item.sums1 = ['qty','hasSendQty','itemDataQty',"hasSendQty"]
           item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount','totalPrice']
         })
         this.listLoading = false

src/views/deposit_commerce/refund_list.vue

@@ -143,11 +143,26 @@
                   <el-input v-model="screenForm.geLiInerNote"></el-input>
                 </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="factoryNo">
                   <el-input v-model="screenForm.factoryNo"></el-input>
                 </el-form-item>
 
+              </el-col> -->     <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startFactoryNo">
+                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endFactoryNo">
+
+                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="资料审核开始日期" prop="startAcceptTime">
@@ -335,6 +350,12 @@
               </template>
             </el-table-column>
             <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
+            <!-- <el-table-column align="right" label="合同价格" prop="contractPrice" min-width="160" show-overflow-tooltip >
+                <template slot-scope="scope">
+                  {{ scope.row.contractPrice | numToFixed}}
+                </template>
+              </el-table-column> -->
+
             <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -417,6 +438,8 @@ export default {
         startAcceptTime: "",
         endAcceptTime: "",
         geLiInerNote: "",
+        startFactoryNo:'',
+        endFactoryNo:''
       }, // 搜索表单
       refundDepositArr: [
         {
@@ -653,7 +676,7 @@ export default {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
         item.totalPrice = item.itemPrice * item.itemQty;
-        item.sums1 = ["hasSendQty", "itemDataQty", "itemQty"];
+        item.sums1 = ["hasSendQty", "itemDataQty", "itemQty","hasSendQty"];
         item.sums2 = [
           "itemDepositAmount",
           "diffAmount",
@@ -661,6 +684,7 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
+          "contractPrice"
         ];
       });
       this.dataList = res.data.records;

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -164,8 +164,8 @@
             min-width="160"
             show-overflow-tooltip
           />
-          <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
           <el-table-column
             align="center"
@@ -209,13 +209,13 @@
             min-width="160"
             show-overflow-tooltip
           />
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="上交资料"-->
-<!--            prop="dataQty"-->
-<!--            min-width="160"-->
-<!--            show-overflow-tooltip-->
-<!--          />-->
+          <el-table-column
+            align="center"
+            label="上交资料"
+            prop="dataQty"
+            min-width="160"
+            show-overflow-tooltip
+          />
           <el-table-column
             align="center"
             label="收差全额"
@@ -458,8 +458,8 @@ export default {
               arr.push(item)
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
-        item.sums2 = ['totalAmount', 'diffAmount', 'price']
+        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty"]
+        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
       })
       res.data.items = arr
       this.details = res.data

src/views/deposit_home/components/deposit_list-detail.vue

@@ -221,8 +221,8 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="right"
@@ -278,13 +278,13 @@
                 {{ scope.row.depositAmount | numToFixed }}
               </template>
             </el-table-column>
-<!--            <el-table-column-->
-<!--              align="right"-->
-<!--              label="上交资料"-->
-<!--              prop="dataQty"-->
-<!--              min-width="160"-->
-<!--              show-overflow-tooltip-->
-<!--            />-->
+            <el-table-column
+              align="right"
+              label="上交资料"
+              prop="dataQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
             <el-table-column
               align="right"
               label="收差全额"
@@ -930,8 +930,8 @@ export default {
               arr.push(item)
             }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
-            item.sums2 = ['totalAmount', 'diffAmount', 'price']
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty"]
+            item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
           })
           res.data.items = arr
           this.details = res.data

src/views/deposit_home/components/refund_list-detail.vue

@@ -65,7 +65,7 @@
           <div class="label">移动电话</div>
           <div class="value">
             <el-input
-              :disabled="title == '详情'"
+              :readonly="title == '详情'"
               placeholder="请输入"
               v-model="detailList.refPhone"
             ></el-input>
@@ -119,7 +119,16 @@
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">安装时间</div>
           <div class="value">
-            <el-date-picker prefix-icon="''" placeholder="请选择安装时间" :disabled="title == '详情'" class="selectStyle" v-model="detailList.installDate" type="datetime" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              prefix-icon="''"
+              placeholder="请选择安装时间"
+              :readonly="title == '详情'"
+              class="selectStyle"
+              v-model="detailList.installDate"
+              type="datetime"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -158,22 +167,215 @@
           <div class="label">备注</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.remark" placeholder="请输入内容"></el-input>
+            <el-input
+              :readonly="detailList.examineStatus !== 'WAIT'"
+              v-model="detailList.remark"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
         <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">
-            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.geLiInerNote" placeholder="请输入内容"></el-input>
+            <el-input
+              :readonly="detailList.examineStatus !== 'WAIT'"
+              v-model="detailList.geLiInerNote"
+              placeholder="请输入内容"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">提交保证函</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refPromiseProvide"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">跟进函备注</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refFollowAcceptRemark"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料提交日期</div>
+          <div class="value">{{ detailList.refDatumProvideDate }}</div>
+          <!-- <div class="value">
+            <el-date-picker
+              prefix-icon="''"
+              placeholder="请选择安装时间"
+              class="selectStyle"
+              v-model="detailList.refDatumProvideDate"
+              type="datetime"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </div> -->
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">大额工程</div>
+          <div class="value">{{ detailList.refIsBigAmounts }}</div>
+          <!-- <div class="value">
+            <el-select
+              v-model="detailList.refIsBigAmounts"
+              v
+              clearable
+              filterable
+            >
+              <el-option label="是" value="是"> </el-option>
+              <el-option label="否" value="否"> </el-option>
+            </el-select>
+          </div> -->
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">合同变更批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refContractResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">工程机转零售批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refToRetailResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料延期批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refDataDelayResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">其他附件批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refOtherAnnexResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">保证函受理状态</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refPromiseAcceptStatus"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">保证函备注</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refPromisePriceRemark"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">附件备注</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refFjShenPiRemark"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料状态</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refDatumProvide"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料审核结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refDatumAcceptStatus"
+            ></el-input>
           </div>
-
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">合同变更批复意见</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refContractIdea"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">工程机转零售批复意见</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refToRetailIdea"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料延期批复意见</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refDataDelayIdea"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">其他附件审批</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refOtherAnnexIdea"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料审核日期</div>
+          <div class="value">{{ detailList.refDatumAcceptDate }}</div>
+          <!-- <div class="value">
+            <el-date-picker
+            readonly
+              prefix-icon="''"
+              placeholder="请选择安装时间"
+              class="selectStyle"
+              v-model="detailList.refDatumAcceptDate"
+              type="datetime"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </div> -->
         </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
             <el-date-picker
-              :disabled="title == '详情'"
+              :readonly="title == '详情'"
               class="selectStyle"
               v-model="detailList.sendFactoryDate"
               type="datetime"
@@ -208,35 +410,32 @@
             show-summary
             :summary-method="$getSummaries"
           >
-
-
-              <template v-if="!isCustomer">
-
-                     <el-table-column
-              align="left"
-              label="厂编号"
-              prop="factoryNo"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.factoryNo" />
-                <span>{{scope.row.factoryNo}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="left"
-              label="物料编码"
-              prop="materialNumber"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialNumber" />
-                <span>{{scope.row.materialNumber}}</span>
-              </template>
-            </el-table-column>
-              </template>
+            <template v-if="!isCustomer">
+              <el-table-column
+                align="left"
+                label="厂编号"
+                prop="factoryNo"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <CopyButton :copyText="scope.row.factoryNo" />
+                  <span>{{ scope.row.factoryNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="left"
+                label="物料编码"
+                prop="materialNumber"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <CopyButton :copyText="scope.row.materialNumber" />
+                  <span>{{ scope.row.materialNumber }}</span>
+                </template>
+              </el-table-column>
+            </template>
 
             <el-table-column
               align="left"
@@ -247,7 +446,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -259,7 +458,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -271,7 +470,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -281,9 +480,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -300,8 +499,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
-            </template>
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -324,17 +523,37 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
             </el-table-column>
-<!--            <el-table-column-->
-<!--              align="right"-->
-<!--              label="上交资料"-->
-<!--              prop="dataQty"-->
-<!--              min-width="160"-->
-<!--              show-overflow-tooltip-->
-<!--            />-->
+            <el-table-column
+              align="right"
+              label="合同价格"
+              prop="contractPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <template v-if="detailList.examineStatus !== 'WAIT'">
+                  {{ scope.row.contractPrice }}
+                </template>
+                <el-input
+                  v-else
+                  class="inpt"
+                  v-model="scope.row.contractPrice"
+                  size="mini"
+                  clearable
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="上交资料"
+              prop="dataQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
             <el-table-column
               align="right"
               label="收差全额"
@@ -342,9 +561,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.diffAmount | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed }}
+              </template>
             </el-table-column>
           </el-table>
         </div>
@@ -352,35 +571,111 @@
     </div>
 
     <h3 class="gdzl">工程资料</h3>
-    <el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn">批量下载</el-button>
+    <el-button
+      :readonly="isDis"
+      class="batchDownload"
+      type="primary"
+      size="small"
+      @click="batchDownloadFn"
+      >批量下载</el-button
+    >
 
     <el-divider></el-divider>
 
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="资料描述" prop="dataDescribe" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="原文件名" prop="fileName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="缩略图" prop="fileUrl" min-width="160" show-overflow-tooltip>
+        <el-table
+          v-loading="listLoading"
+          :data="detailList.dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="left"
+            label="资料描述"
+            prop="dataDescribe"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="原文件名"
+            prop="fileName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="缩略图"
+            prop="fileUrl"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-image ref="img" :src="imageURL + scope.row.fileUrl" v-if="checkFileType(scope.row.fileUrl) == 'image'" style="width: 120px; height: 120px" fit="cover" :preview-src-list="[imageURL + scope.row.fileUrl]">
+              <el-image
+                ref="img"
+                :src="imageURL + scope.row.fileUrl"
+                v-if="checkFileType(scope.row.fileUrl) == 'image'"
+                style="width: 120px; height: 120px"
+                fit="cover"
+                :preview-src-list="[imageURL + scope.row.fileUrl]"
+              >
               </el-image>
-              <img class="file" src="@/assets/common/word.png" v-if="checkFileType(scope.row.fileUrl) == 'word'" />
-              <img class="file" src="@/assets/common/excel.png" v-if="checkFileType(scope.row.fileUrl) == 'excel'" />
-              <img class="file" src="@/assets/common/ppt.png" v-if="checkFileType(scope.row.fileUrl) == 'ppt'" />
-              <img class="file" src="@/assets/common/pdf.png" v-if="checkFileType(scope.row.fileUrl) == 'pdf'" />
-              <img v-if="checkFileType(scope.row.fileUrl) == 'file'" class="file aaa" src="@/assets/common/zip.jpeg" />
+              <img
+                class="file"
+                src="@/assets/common/word.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'word'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/excel.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'excel'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/ppt.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'ppt'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/pdf.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'pdf'"
+              />
+              <img
+                v-if="checkFileType(scope.row.fileUrl) == 'file'"
+                class="file aaa"
+                src="@/assets/common/zip.jpeg"
+              />
             </template>
           </el-table-column>
-          <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="left"
+            label="下载文件名称"
+            prop="fileName"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
               {{ "资料_" + scope.row.fileName }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-button type="text" class="textColor" @click="downLoadFn(scope.row.fileUrl,scope.row.fileName)">下载</el-button>
+              <el-button
+                type="text"
+                class="textColor"
+                @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
+                >下载</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -409,34 +704,88 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.checkRecordItems" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="申请人" prop="submitName" 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="applyNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收人" prop="checkName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收说明" prop="checkNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="审批结果" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
+        <el-table
+          v-loading="listLoading"
+          :data="detailList.checkRecordItems"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="left"
+            label="申请人"
+            prop="submitName"
+            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="applyNote"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="验收人"
+            prop="checkName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="受理日期"
+            prop="checkDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="验收说明"
+            prop="checkNote"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="审批结果"
+            prop="isRefundDeposit"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              {{scope.row.isRefundDeposit == false?'否':'是'}}
+              {{ scope.row.isRefundDeposit == false ? "否" : "是" }}
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
 
-    <h3 v-if="
+    <h3
+      v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||
         detailList.examineStatus == 'OK'
-      ">
+      "
+    >
       审批
     </h3>
-    <el-divider v-if="
+    <el-divider
+      v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||
         detailList.examineStatus == 'OK'
-      "></el-divider>
+      "
+    ></el-divider>
     <div v-if="detailList.examineStatus == 'WAIT'" class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -446,7 +795,15 @@
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
           <div class="label">受理日期</div>
           <div class="value">
-            <el-date-picker disabled prefix-icon="''" class="selectStyle" type="datetime" placeholder="系统自动生成" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              readonly
+              prefix-icon="''"
+              class="selectStyle"
+              type="datetime"
+              placeholder="系统自动生成"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -468,9 +825,12 @@
       </el-row>
     </div>
 
-    <div v-if="
+    <div
+      v-if="
         detailList.examineStatus == 'OK' || detailList.examineStatus == 'FAIL'
-      " class="diy-table-1">
+      "
+      class="diy-table-1"
+    >
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">验收人</div>
@@ -479,7 +839,16 @@
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
           <div class="label">受理日期</div>
           <div class="value">
-            <el-date-picker disabled prefix-icon="''" class="selectStyle" v-model="detailList.checkDate" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              readonly
+              prefix-icon="''"
+              class="selectStyle"
+              v-model="detailList.checkDate"
+              type="datetime"
+              placeholder=""
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -487,21 +856,28 @@
           <div class="label">是否退押</div>
           <div class="value">
             <el-radio-group v-model="detailList.isRefundDeposit">
-              <el-radio disabled :label="true">是</el-radio>
-              <el-radio disabled :label="false">否</el-radio>
+              <el-radio readonly :label="true">是</el-radio>
+              <el-radio readonly :label="false">否</el-radio>
             </el-radio-group>
           </div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item dateS">
           <div class="label">验收说明</div>
           <div class="value">
-            <el-input disabled v-model="detailList.checkNote" placeholder="请输入内容"></el-input>
+            <el-input
+              readonly
+              v-model="detailList.checkNote"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item dateS">
           <div class="label">审批通过后备注</div>
           <div class="value">
-            <el-input v-model="detailList.examineAfterRemark" placeholder="请输入内容"></el-input>
+            <el-input
+              v-model="detailList.examineAfterRemark"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
       </el-row>
@@ -511,9 +887,27 @@
     <!-- detailList.examineStatus != 'OK' || detailList.examineStatus != 'FAIL' -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button v-if="detailList.examineStatus == 'WAIT'" type="primary" size="small" @click="adoptFn">审批通过</el-button>
-        <el-button v-if="detailList.examineStatus == 'WAIT'" type="primary" size="small" @click="rejectFn">审批驳回</el-button>
-        <el-button v-if="detailList.examineStatus == 'OK'" type="primary" size="small" @click="saveFn">保存</el-button>
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="adoptFn"
+          >审批通过</el-button
+        >
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="rejectFn"
+          >审批驳回</el-button
+        >
+        <el-button
+          v-if="detailList.examineStatus == 'OK'"
+          type="primary"
+          size="small"
+          @click="saveFn"
+          >保存</el-button
+        >
       </div>
     </div>
   </div>
@@ -739,16 +1133,22 @@ export default {
       } else {
         this.isDis = false;
       }
-      let arr = []
+      let arr = [];
       res.data.items.forEach((item) => {
-        if (Number(item.qty)>0) {
-              arr.push(item)
-            }
+        if (Number(item.qty) > 0) {
+          arr.push(item);
+        }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
-        item.sums2 = ["totalAmount", "diffAmount", "price"];
+        item.sums1 = ["orderHasSendQty", "dataQty", "qty", "hasSendQty"];
+        item.sums2 = [
+          "totalAmount",
+          "diffAmount",
+          "price",
+          "depositAmount",
+          "contractPrice",
+        ];
       });
-      res.data.items = arr
+      res.data.items = arr;
       this.detailList = res.data;
       if (
         res.data.examineStatus == "SAVE" ||
@@ -766,6 +1166,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.inpt {
+  ::v-deep .el-input__inner {
+    text-align: right;
+  }
+}
 .aaa {
   height: 64px;
   width: 64px;

src/views/deposit_home/deposit_list.vue

@@ -196,10 +196,26 @@
                   <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+              <!-- <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
                 <el-form-item label="厂编号" prop="factoryNo">
                   <el-input v-model="screenForm.factoryNo" placeholder="请输入厂编号"></el-input>
                 </el-form-item>
+              </el-col> -->
+              <el-col :xs="24" :sm="12" :lg="6" v-if="!isCustomer">
+                <el-form-item label="厂编号" style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startFactoryNo">
+                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endFactoryNo">
+
+                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="资料审核开始日期" prop="startAcceptTime">
@@ -232,7 +248,7 @@
                   <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>
+                <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
               </div>
               <el-form-item label="" class="fr">
                 <el-button
@@ -489,13 +505,13 @@
               show-overflow-tooltip
             />
 
-<!--            <el-table-column-->
-<!--              align="right"-->
-<!--              label="上交资料"-->
-<!--              prop="itemDataQty"-->
-<!--              min-width="160"-->
-<!--              show-overflow-tooltip-->
-<!--            />-->
+            <el-table-column
+              align="right"
+              label="上交资料"
+              prop="itemDataQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
             <el-table-column
               align="center"
               label="操作"
@@ -600,6 +616,8 @@ export default {
         startAcceptTime: '',
         endAcceptTime: '',
         geLiInerNote: '',
+        startFactoryNo:'',
+        endFactoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

src/views/deposit_home/refund_list.vue

@@ -11,16 +11,28 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="140px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
+                <el-input
+                  v-model="screenForm.refEnginRecordNo"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
+                <el-input
+                  v-model="screenForm.customerKeyword"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -33,41 +45,77 @@
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+                <el-input
+                  v-model="screenForm.refTradeCategory"
+                  placeholder="请输入"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
+                <el-input
+                  v-model="screenForm.refUseUnit"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker v-model="screenForm.startSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
+                <el-date-picker
+                  v-model="screenForm.startSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker v-model="screenForm.endSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
+                <el-date-picker
+                  v-model="screenForm.endSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select style="width: 100%" v-model="screenForm.isRefundDeposit" placeholder="请选择是否退押 ">
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.isRefundDeposit"
+                  placeholder="请选择是否退押 "
+                >
                   <el-option label="默认" :value="null"></el-option>
 
-                  <el-option v-for="item in refundDepositArr" :key="item.value" :label="item.label" :value="item.value">
+                  <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-form-item label="状态 " prop="examineStatus">
-                <el-select style="width: 100%" v-model="screenForm.examineStatus" placeholder="请选择状态 ">
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.examineStatus"
+                  placeholder="请选择状态 "
+                >
                   <el-option label="默认" :value="null"></el-option>
 
-                  <el-option v-for="item in examineStatusArr" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option
+                    v-for="item in examineStatusArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -84,72 +132,139 @@
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始受理日期" prop="startConfirmTime">
-                <el-date-picker v-model="screenForm.startConfirmTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                <el-date-picker
+                  v-model="screenForm.startConfirmTime"
+                  class="dateStyle"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束受理日期" prop="endConfirmTime">
-                <el-date-picker v-model="screenForm.endConfirmTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                <el-date-picker
+                  v-model="screenForm.endConfirmTime"
+                  class="dateStyle"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <template v-if="!isCustomer">
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="审核人" prop="confirmName">
-                  <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
+                  <el-input
+                    v-model="screenForm.confirmName"
+                    placeholder="请输入审核人"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="区域" prop="refRegionWork">
-                  <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+                  <el-input
+                    v-model="screenForm.refRegionWork"
+                    placeholder="请输入区域"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期" style="margin-bottom:0">
+                <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-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 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>
                   </div>
                 </el-form-item>
               </el-col>
               <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-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-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-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-input v-model="screenForm.factoryNo" placeholder="厂编号"></el-input>
+                <el-form-item label="厂编号" style="margin-bottom: 0">
+                  <div class="fanwei">
+                    <el-form-item prop="startFactoryNo">
+                      <el-input
+                        v-model="screenForm.startFactoryNo"
+                        placeholder="厂编号开始"
+                      ></el-input>
+                    </el-form-item>
+                    <span>-</span>
+                    <el-form-item prop="endFactoryNo">
+                      <el-input
+                        v-model="screenForm.endFactoryNo"
+                        placeholder="厂编号结束"
+                      ></el-input>
+                    </el-form-item>
+                  </div>
                 </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" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                  <el-date-picker
+                    v-model="screenForm.startAcceptTime"
+                    class="dateStyle"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    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" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                  <el-date-picker
+                    v-model="screenForm.endAcceptTime"
+                    class="dateStyle"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期"
+                  />
                 </el-form-item>
               </el-col>
               <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -169,7 +284,6 @@
 
 
               </el-col> -->
-
             </template>
             <el-col :xs="24" :sm="24" :lg="24">
               <div class="fl">
@@ -181,7 +295,9 @@
               </div>
               <el-form-item label="" class="fr">
                 <el-button size="mini" @click="resetFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+                <el-button size="mini" type="primary" @click="searchFn"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -195,10 +311,31 @@
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
           <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+          <el-popconfirm
+            title="批量审核吗？"
+            @onConfirm="batchExamine"
+            v-if="$checkBtnRole('examine', $route.meta.roles)"
+          >
+            <el-button
+              slot="reference"
+              size="mini"
+              type="warning"
+              icon="el-icon-finished"
+              >批量审核工程机已审单据</el-button
+            >
+          </el-popconfirm>
         </div>
         <div class="fr">
-          <el-button type="primary" size="mini" @click="exportFn">导出</el-button>
-          <el-upload class="import-btn" action="" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
+          <el-button type="primary" size="mini" @click="exportFn"
+            >导出</el-button
+          >
+          <el-upload
+            class="import-btn"
+            action=""
+            :http-request="handleImport"
+            :file-list="importFileList"
+            :show-file-list="false"
+          >
             <el-button type="primary" size="mini">导入</el-button>
           </el-upload>
         </div>
@@ -206,111 +343,259 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange" show-summary :summary-method="$getSummaries">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            @selection-change="handleSelectionChange"
+            show-summary
+            :summary-method="$getSummaries"
+          >
             >
             <el-table-column type="selection" align="center" width="55">
             </el-table-column>
-            <el-table-column align="left" label="状态" prop="" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="状态"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template v-slot="{ row }">
-                <el-tag size="mini" v-show="row.examineStatus == 'SAVE'">保存</el-tag>
-                <el-tag size="mini" v-show="row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
-                <el-tag size="mini" v-show="row.examineStatus == 'OK'" type="success">通过</el-tag>
-                <el-tag size="mini" v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'SAVE'"
+                  >保存</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="row.examineStatus == 'WAIT'"
+                  type="warning"
+                  >待审核</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="row.examineStatus == 'OK'"
+                  type="success"
+                  >通过</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="row.examineStatus == 'FAIL'"
+                  type="danger"
+                  >不通过</el-tag
+                >
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="工程登录编号"
+              prop="refEnginRecordNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
-                <span>{{scope.row.refEnginRecordNo}}</span>
+                <span>{{ scope.row.refEnginRecordNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="申请日期"
+              prop="submitTime"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <span>{{scope.row.submitTime}}</span>
+                <span>{{ scope.row.submitTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="受理日期"
+              prop="checkDate"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <span>{{scope.row.checkDate}}</span>
+                <span>{{ scope.row.checkDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商编码"
+              prop="customerNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
-                <span>{{scope.row.customerNumber}}</span>
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商名称"
+              prop="customerName"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="跨厂区编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="跨厂区编号"
+              prop="refFactoryNo"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refFactoryNo" />
-                <span>{{scope.row.refFactoryNo}}</span>
+                <span>{{ scope.row.refFactoryNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="厂编号"
+              prop="factoryNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            <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>
+                <span>{{ scope.row.refTradeCategory }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="使用单位"
+              prop="refUseUnit"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refUseUnit" />
-                <span>{{scope.row.refUseUnit}}</span>
+                <span>{{ scope.row.refUseUnit }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="区域"
+              prop="refRegionWork"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refRegionWork" />
-                <span>{{scope.row.refRegionWork}}</span>
+                <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>
+            <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>
+                <span>{{ scope.row.geLiInerNote }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialNumber"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />
-                <span>{{scope.row.materialNumber}}</span>
+                <span>{{ scope.row.materialNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="是否退押" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="是否退押"
+              prop="isRefundDeposit"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.isRefundDeposit" type="success" size="small">是</el-tag>
+                <el-tag
+                  v-if="scope.row.isRefundDeposit"
+                  type="success"
+                  size="small"
+                  >是</el-tag
+                >
                 <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="押金金额" prop="itemDepositAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="押金金额"
+              prop="itemDepositAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.itemDepositAmount | numToFixed }}
               </template>
@@ -318,65 +603,137 @@
             <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column> -->
 
-            <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="安装日期"
+              prop="installDate"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="left" label="审核人" prop="confirmName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="审核人"
+              prop="confirmName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.confirmName" />
-                <span>{{scope.row.confirmName}}</span>
+                <span>{{ scope.row.confirmName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="金额" prop="totalPrice" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="金额"
+              prop="totalPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.totalPrice | numToFixed}}
+                {{ scope.row.totalPrice | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="right" label="发货数量" prop="orderHasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column
+              align="right"
+              label="订单数量"
+              prop="itemQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="合同价格"
+              prop="contractPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{ scope.row.contractPrice | numToFixed }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              align="right"
+              label="发货数量"
+              prop="orderHasSendQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed}}
               </template>
             </el-table-column> -->
-<!--            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />-->
+
+            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
+
               <template slot-scope="scope">
-                <el-button type="text" class="textColor" v-if="
+                <el-button
+                  type="text"
+                  class="textColor"
+                  v-if="
                     scope.row.examineStatus == 'WAIT' &&
                     $checkBtnRole('examine', $route.meta.roles)
-                  " @click="examineFn(scope.row.depositManageId)">审批</el-button>
+                  "
+                  @click="examineFn(scope.row.depositManageId)"
+                  >审批</el-button
+                >
 
-                <el-button type="text" class="textColor" v-if="
+                <el-button
+                  type="text"
+                  class="textColor"
+                  v-if="
                     scope.row.examineStatus == 'SAVE' ||
                     scope.row.examineStatus == 'OK' ||
                     scope.row.examineStatus == 'FAIL'
-                  " @click="infoFn(scope.row.depositManageId)">详情</el-button>
+                  "
+                  @click="infoFn(scope.row.depositManageId)"
+                  >详情</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
     <RefundListDetail @updateList="updateList" :detailId="detailId" v-else />
+    <ExamineDialog
+      :isShow.sync="isShowExamineDialog"
+      :examineForm.sync="examineForm"
+    />
   </div>
 </template>
 
 <script>
 import {
+  examineData,
   getDepositManageList,
   getDepositManageDate,
   getDepositManagExport,
 } from "@/api/engin_deposit/refund_list";
 import { downloadFiles, handleImport } from "@/utils/util";
+import ExamineDialog from "@/components/Common/examine-dialog";
+
 import RefundListDetail from "./components/refund_list-detail.vue";
 export default {
   components: {
     RefundListDetail,
+    ExamineDialog,
   },
   data() {
     return {
@@ -414,6 +771,8 @@ export default {
         startAcceptTime: "",
         endAcceptTime: "",
         geLiInerNote: "",
+        startFactoryNo: "",
+        endFactoryNo: "",
       }, // 搜索表单
       refundDepositArr: [
         {
@@ -453,6 +812,11 @@ export default {
       showSurrender: true,
       detailId: "",
       selectData: [],
+      isShowExamineDialog: false,
+      examineForm: {
+        status: "OK",
+        remark: "",
+      },
     };
   },
   created() {
@@ -510,6 +874,47 @@ export default {
         this.$message.error(result.message);
       }
     },
+    // 打开 批量审批
+    batchExamine() {
+      // if (this.selectData.length) {
+      this.submitExamineForm();
+      // this.isShowExamineDialog = true;
+      //   return
+      // }
+      // this.$errorMsg('请选择审核项')
+    },
+    // 提交 批量审批
+    submitExamineForm() {
+      let ids = this.selectData.map((item) => {
+        return item.id;
+      });
+      ids = [...new Set(ids)];
+      examineData({
+        id: ids.join(","),
+        examineStatus: this.examineForm.status,
+        examineRemark: this.examineForm.remark,
+        serviceId: "",
+      }).then((res) => {
+        this.isShowExamineDialog = false;
+        this.$successMsg("修改成功");
+        this.getDataList({
+          pageSize: this.pageSize,
+          pageNum: this.currentPage,
+          confirmName: "",
+          createName: "",
+          customerKeyword: "",
+          // endDeliverTime: "",
+          enginOrderNo: "",
+          enginOrderType: this.enginOrderType,
+          examineStatus: "",
+          refEnginRecordNo: "",
+          refProjectName: "",
+          refUseUnit: "",
+          ...this.screenForm,
+          // startDeliverTime: "",
+        });
+      });
+    },
     //审批后更新列表数据
     updateList() {
       this.getDataList({
@@ -650,7 +1055,7 @@ export default {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
         item.totalPrice = item.itemPrice * item.itemQty;
-        item.sums1 = ["orderHasSendQty", "itemDataQty", "itemQty"];
+        item.sums1 = ["orderHasSendQty", "itemDataQty", "itemQty","hasSendQty"];
         item.sums2 = [
           "itemDepositAmount",
           "diffAmount",
@@ -658,6 +1063,7 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
+          "contractPrice",
         ];
       });
       this.dataList = res.data.records;

src/views/finance/change_list.vue

@@ -21,6 +21,11 @@
                 <el-input v-model="searchForm.id" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商名称" prop="customerName">
+                <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="返利类型" prop="walletName">
@@ -34,7 +39,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="24">
               <el-form-item label="" class="fr">
                 <el-button size="mini" @click="clearFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
@@ -202,6 +207,7 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       searchForm: {
+        customerName: "",
         startTime: "",
         walletName: "",
         id: "",
@@ -215,55 +221,56 @@ export default {
   created() {
     const res = JSON.parse(localStorage.getItem("supply_user"));
     this.isCustomer = res.isCustomer;
-    this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
+    this.getDataList();
   },
   methods: {
     //取消
     async cancelFn(id) {
       await getTransferCancel({ id });
-      this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
+      this.getDataList();
       this.$message.success("取消成功");
     },
     //切换radio
     changeRadioGroupFn(v) {
       // console.log(v);
       this.currentPage = 1;
-      this.pageSize = 10;
-      this.getDataList({
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-        examineStatus: v,
-      });
+
+      this.getDataList();
     },
     //撤回
     withdrawFn() {},
     //刷新
     refreshFn() {
-      this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
+      this.getDataList();
     },
     //提审
     async submitFn(id) {
       await getTransferSubmit({ id });
       this.$message.success("提审成功");
-      this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
+      this.getDataList();
     },
     //清空
     clearFn() {
-      console.log(this.$refs.searchForm);
       this.$refs.searchForm.resetFields();
     },
     //搜索
     searchFn() {
-      this.getDataList({
-        ...this.searchForm,
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-      });
+      this.currentPage = 1;
+      this.getDataList();
     },
 
     //获取列表数据
-    async getDataList(data) {
-      const res = await getChangeList(data);
+    async getDataList() {
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        customerName: this.searchForm.customerName,
+        examineStatus: this.category,
+        id: this.searchForm.id,
+        startTime: this.searchForm.startTime,
+        walletName: this.searchForm.walletName,
+      };
+      const res = await getChangeList(params);
       // console.log(res);
       res.data.records.forEach((item) => {
         item.sums1 = [];
@@ -297,20 +304,12 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = 1;
-      this.getDataList({
-        pageNum: 1,
-        pageSize: this.pageSize,
-        examineStatus: this.category,
-      });
+      this.getDataList();
     },
     // 更改当前页
     handleCurrentChange(val) {
       this.currentPage = val;
-      this.getDataList({
-        pageNum: val,
-        pageSize: 10,
-        examineStatus: this.category,
-      });
+      this.getDataList();
     },
   },
 };

src/views/finance/rebate_list.vue

@@ -76,9 +76,8 @@
           <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('apply', $route.meta.roles) && searchForm.examineStatus ==='SAVE'" class="delClass" @onConfirm="batchApplication" title="确定执行批量申请吗？">
             <el-button :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量申请</el-button>
           </el-popconfirm>
-          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='WAIT'" class="delClass" @onConfirm="batchAudit" title="确定执行批量申请吗？">
-            <el-button :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量审核</el-button>
-          </el-popconfirm>
+          <el-button @click="batchAudit('audit')" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='WAIT'" :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量审核</el-button>
+          <el-button @click="batchReview('review')" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='OK_ONE_AND_CONFIRM'" :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量复核</el-button>
           <!-- <el-button @click="batchApplication" :disabled='deleList.length < 1' size="mini" type="warning" icon="el-icon-finished" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='SAVE'">批量申请</el-button> -->
         </div>
         <div class="fr">
@@ -260,6 +259,7 @@ import {
   getRebateOrderBatchDel,
   getRebateOrderApplyBatch,
   getRebateOrderExamineBatch,
+  getRebateOrderExamine2Batch,
 } from "@/api/finance/rebate_list";
 import RebateListApply from "./components/rebate_list-apply.vue";
 import RebateListExamine from "./components/rebate_list-examine.vue";
@@ -308,6 +308,7 @@ export default {
         status: "",
         remark: "",
       },
+      state: "",
     };
   },
   computed: {
@@ -333,23 +334,39 @@ export default {
     }
   },
   methods: {
+    //批量复核
+    batchReview(value) {
+      this.state = value;
+      this.isShowExamineDialog = true;
+    },
+
     //批量审核
-    batchAudit() {
+    batchAudit(value) {
+      this.state = value;
       this.isShowExamineDialog = true;
     },
     //提交批量审核
     async submitExamineForm() {
       let res = this.deleList.toString();
+      if (this.state === "audit") {
+        await getRebateOrderExamineBatch({
+          ids: res,
+          examineStatus: this.examineForm.status,
+          examineRemark: this.examineForm.remark,
+        });
+        this.$message.success("批量审核成功");
+      } else {
+        await getRebateOrderExamine2Batch({
+          ids: res,
+          examineStatus: this.examineForm.status,
+          examineRemark: this.examineForm.remark,
+        });
+        this.$message.success("批量复核成功");
+      }
 
-      await getRebateOrderExamineBatch({
-        ids: res,
-        examineStatus: this.examineForm.status,
-        examineRemark: this.examineForm.remark,
-      });
       this.deleList = [];
       this.isShowExamineDialog = false;
       this.getDataList();
-      this.$message.success("批量审批成功");
     },
     //批量申请
     async batchApplication() {

src/views/finance/receivable_list.vue

@@ -113,6 +113,7 @@
                 {{ scope.row.totalAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="项目费用名称" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
 
             <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
@@ -274,7 +275,7 @@ export default {
     },
     selectionChangeFn(value) {
       // console.log(value);
-      const res = value.map((v) => v.id);
+      const res = value.map((v) => v.itemId);
       // console.log(res);
       this.deleList = res;
     },

src/views/sales_policy/components/TabelTransfer.vue

@@ -142,6 +142,7 @@
              <h4 style="display: inline-block; margin-right: 20px">
                   经销商上限
        </h4>
+
   <el-divider />
     </div>
     <div style="margin: 20px 0">
@@ -397,6 +398,7 @@ export default {
       this.getPolicyList();
     }
   },
+
   methods: {
     getList() {
       this.getCrList();
@@ -510,7 +512,7 @@ export default {
         });
 
 
-         
+
 
         for (let i = 0; i < result.data.length; i++) {
           result.data[i].customerNumber = result.data[i].number;

src/views/sales_policy/components/details.vue

@@ -374,7 +374,7 @@
               </el-col>
             </el-row>
             <el-divider />
-               <el-radio-group v-model="detail.flag+''">
+               <el-radio-group v-model="detail.flag">
           <el-radio label="0" :disabled="detail.flag !=0">指定经销商</el-radio>
           <el-radio label="1" :disabled="detail.flag !=1">广州经销商</el-radio>
           <el-radio label="2" :disabled="detail.flag !=2">佛山经销商</el-radio>
@@ -603,11 +603,10 @@
         ></el-col
       >
     </el-row> -->
-     <div>
-             <h4 style="display: inline-block; margin-right: 20px">
-                  经销商上限
-       </h4>
-  <el-divider />
+     <div style="dispaly:flex">
+        <h4 style="display: inline-block; margin-right: 20px">经销商上限</h4>
+        <ExportButton  style="display: inline-block; margin-right: 20px"  :exUrl="'/policy/limit/export'" :exParams="exParams" />
+        <el-divider />
     </div>
 
     <div>
@@ -863,6 +862,11 @@ export default {
         title = '详情页'
       }
       return title
+    },
+    exParams(){
+      return {
+        policyId:this.detail.code,
+      }
     }
   },
   created() {},
@@ -875,7 +879,7 @@ export default {
       this.listLoading = true
       getPolicyDetail({ policyId: this.$parent.id }).then((res) => {
         this.detail = res.data
-
+        this.detail.flag = this.detail.flag +''
         this.srcList = [this.$imageUrl + this.detail.imgSrc]
         if (this.$parent.isShow == 5 && this.detail.imgSrc) {
           this.fileList = [

src/views/supply/engin/components/home_detail.vue

@@ -189,8 +189,8 @@
             <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>

src/views/supply/engin/components/home_examine.vue

@@ -220,8 +220,8 @@
         <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/supply/engin/components/home_form.vue

@@ -217,12 +217,12 @@
             <div v-else>{{scope.row.specification}}</div>
           </template>
         </el-table-column>
-        <!-- <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.realMaterialNumber" size="small" readonly @click.native="getRealMaterData(scope.$index)" ></el-input>
           </template>
         </el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
             <el-input v-model="scope.row.realMaterialOldNumber" size="small" readonly @click.native="getRealMaterData(scope.$index)"></el-input>
           </template>
@@ -232,7 +232,7 @@
             <el-input v-model="scope.row.realSpecification" size="small" readonly @click.native="getRealMaterData(scope.$index)" ></el-input>
 
           </template>
-            </el-table-column> -->
+            </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -497,7 +497,7 @@
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="proNum">
-              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入产品编码"></el-input>
+              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入物料编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
@@ -534,7 +534,8 @@
               </template>
             </el-table-column>
            <el-table-column align="center" label="销售类型" prop="saleName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+           <el-table-column align="center" label="物料编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+           <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品价格" prop="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>
@@ -1099,6 +1100,7 @@ export default {
     // 重置筛选表单
     resetGoodsScreenForm() {
       this.$refs.goodsScreenForm.resetFields();
+      this.currentRadio = ''
       this.currentPage = 1;
       this.getGoodsList();
     },
@@ -1174,7 +1176,25 @@ export default {
     // 确定 添加产品
     submitAddGoods() {
       // this.goodsList = this.delRepeat(this.rightGoodsList, this.goodsList);
+
       this.goodsList = this.goodsList.concat(this.rightGoodsList);
+      this.goodsList.forEach((k,i)=>{
+        this.$set(this.goodsList[i],'realMaterialId',k.materialId)
+          this.$set(this.goodsList[i],'realMaterialName',k.materialName)
+          this.$set(this.goodsList[i],'realMaterialNumber',k.materialNumber)
+          this.$set(this.goodsList[i],'realMaterialOldNumber',k.materialOldNumber)
+          this.$set(this.goodsList[i],'realSpecification',k.specification)
+          if(!this.listItem){
+            let str =`实装物料编号:${k.materialNumber}实装厂产品编码:${k.materialOldNumber}`
+              let remark
+              if (!this.goodsList[i].remark) {
+                remark = str
+              }else{
+                remark = this.goodsList[i].remark.replace(/str/g,str)
+              }
+            this.$set(this.goodsList[i],'remark',remark)
+          }
+      })
       this.isShowGoodsDialog = false;
       this.leftGoodsList = [];
       this.rightGoodsList = [];
@@ -1196,13 +1216,21 @@ export default {
       //        realSpecification
       // 实装规格型号
       const currentData = this.leftGoodsList.find(e=>e.id===this.currentRadio)
-
           this.$set(this.goodsList[this.currentId],'realMaterialId',currentData.materialId)
           this.$set(this.goodsList[this.currentId],'realMaterialName',currentData.materialName)
           this.$set(this.goodsList[this.currentId],'realMaterialNumber',currentData.materialNumber)
           this.$set(this.goodsList[this.currentId],'realMaterialOldNumber',currentData.materialOldNumber)
           this.$set(this.goodsList[this.currentId],'realSpecification',currentData.specification)
-          this.$set(this.goodsList[this.currentId],'remark',`${this.goodsList[this.currentId].remark},实装物料编号:${currentData.materialNumber},实装厂产品编码:${currentData.materialOldNumber}`)
+          if(!this.listItem){
+            let str =`实装物料编号:${currentData.materialNumber}实装厂产品编码:${currentData.materialOldNumber}`
+            let remark
+            if (!this.goodsList[this.currentId].remark) {
+              remark = str
+            }else{
+              remark = this.goodsList[this.currentId].remark.replace(/str/g,str)
+            }
+            this.$set(this.goodsList[this.currentId],'remark',remark)
+          }
           this.isSetMaterial = false
     },
     // 检查库存
@@ -1400,7 +1428,23 @@ export default {
           }),
         }
       })
-
+      this.goodsList.forEach((k,i)=>{
+        this.$set(this.goodsList[i],'realMaterialId',k.materialId)
+          this.$set(this.goodsList[i],'realMaterialName',k.materialName)
+          this.$set(this.goodsList[i],'realMaterialNumber',k.materialNumber)
+          this.$set(this.goodsList[i],'realMaterialOldNumber',k.materialOldNumber)
+          this.$set(this.goodsList[i],'realSpecification',k.specification)
+          if(!this.listItem){
+            let str =`实装物料编号:${k.materialNumber}实装厂产品编码:${k.materialOldNumber}`
+              let remark
+              if (!this.goodsList[i].remark) {
+                remark = str
+              }else{
+                remark = this.goodsList[i].remark.replace(/str/g,str)
+              }
+            this.$set(this.goodsList[i],'remark',remark)
+          }
+      })
       this.goodsList.forEach(item => {
         item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
         item.serviceId = (item.wallets && item.wallets.length) ? item.wallets[0].serviceId : '';

src/views/supply/engin/components/home_return.vue

@@ -166,8 +166,8 @@
         <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>

src/views/supply/policy/components/retail_form.vue

@@ -485,8 +485,21 @@
             备注：{{ factor[0].remark }}
           </el-row>
           <el-row :gutter="20">
+            <el-col :xs="24" :sm="8" :lg="11">
+              <el-form-item label="规格型号">
+                <div style="display:flex">
+                  <el-input
+                  v-model="screenForm.specification"
+                  placeholder="请输入型号规格型号"
+                />
+                <el-button style="margin-left:10px" type="primary" size="mini" @click="handleGetPolicyList">查询</el-button>
+
+                </div>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="11">
               <el-form-item label="销售政策" class="myselect">
+
                 <el-select
                   v-model="screenForm.policyId"
                   placeholder="选择销售政策"
@@ -512,11 +525,13 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="8" :lg="11">
-              <el-form-item label="型号">
-                <el-input
-                  v-model="screenForm.specification"
-                  placeholder="请输入型号"
+              <el-form-item label="规格型号">
+                <div style="display:flex">
+                  <el-input
+                  v-model="screenForm.specifications"
+                  placeholder="请输入型号规格型号"
                 />
+                </div>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="11">
@@ -538,7 +553,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="11" class="tr">
+            <el-col :xs="22" :sm="22" :lg="22" class="tr">
               <!-- <el-button
                 type="primary"
                 size="small"
@@ -856,6 +871,7 @@ export default {
         saleTypeCode: "",
         factorId: "",
         specification: "",
+        specifications:""
       },
       currentPage: 1,
       listTotal: 0,
@@ -1139,6 +1155,7 @@ export default {
     },
     // 选择销售政策获取政策条件列表
     async handlePolicy(e) {
+      console.log(e);
       this.totalArr = [];
       this.multipleSelections = [];
       this.dataList = [];
@@ -1204,6 +1221,19 @@ export default {
       this.screenForm.policyId = data.policyId;
       this.policyConditionId = data.id;
     },
+    async handleGetPolicyList(){
+     const {data} = await policyList({
+        pageNum: 1,
+        pageSize: -1,
+        status:1,
+        customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
+     specification: this.screenForm.specifications,
+      })
+       this.policyList = data.records
+        if (data.records.length) {
+          this.handlePolicy(data.records[0].id);
+        }
+    },
     // 引用销售政策搜索
     async handlePolicyTypeList() {
       if (!this.screenForm.policyId) {
@@ -1230,9 +1260,9 @@ export default {
         pageSize: -1,
         policyConditionId,
         popType,
-        specification: this.screenForm.specification,
+         specification: this.screenForm.specifications,
         saleTypeCode: this.screenForm.saleTypeCode,
-        customerId: this.listItem ? this.listItem.customerId : "",
+        customerId:  JSON.parse(localStorage.getItem("supply_user")).customerId,
       });
 
       if (!fang) {
@@ -1302,8 +1332,8 @@ export default {
         pageSize: -1,
         policyId: this.screenForm.policyId,
         saleTypeCode: this.screenForm.saleTypeCode,
-        specification: this.screenForm.specification,
-        customerId: this.listItem ? this.listItem.customerId : "",
+         specification: this.screenForm.specifications,
+        customerId:  JSON.parse(localStorage.getItem("supply_user")).customerId,
         [val]: true,
       }).then((res) => {
         this.dataList = res.data.records;
@@ -1649,7 +1679,7 @@ export default {
       policyList({
         pageNum: 1,
         pageSize: -1,
-        customerId: this.listItem ? this.listItem.customerId : "",
+        customerId:  JSON.parse(localStorage.getItem("supply_user")).customerId,
         status: true,
       }).then((res) => {
         if (this.policyId) {

src/views/supply/price/difference_price_list.vue

@@ -0,0 +1,545 @@
+<template>
+  <div class="app-container">
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="screenForm"
+        :model="screenForm"
+        label-width="70px"
+        size="mini"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="物料编码" prop="materialNumber">
+              <el-input
+                v-model="screenForm.materialNumber"
+                placeholder="请输入物料编码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="产品名称" prop="materialName">
+              <el-input
+                v-model="screenForm.materialName"
+                placeholder="请输入产品名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="产品编码" prop="materialOldNumber">
+              <el-input
+                v-model="screenForm.materialOldNumber"
+                placeholder="请输入产品编码"
+              />
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :xs="24" :sm="12" :lg="6">-->
+          <!--            <el-form-item label="生效日期" prop="startDate">-->
+          <!--              <el-date-picker-->
+          <!--                v-model="screenForm.startDate"-->
+          <!--                type="datetime"-->
+          <!--                placeholder="请输入生效日期"-->
+          <!--                value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--              >-->
+          <!--              </el-date-picker>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :xs="24" :sm="12" :lg="6">-->
+          <!--            <el-form-item label="失效日期" prop="endDate">-->
+          <!--              <el-date-picker-->
+          <!--                v-model="screenForm.endDate"-->
+          <!--                type="datetime"-->
+          <!--                placeholder="请输入生效日期"-->
+          <!--                value-format="yyyy-MM-dd HH:mm:ss "-->
+          <!--              >-->
+          <!--              </el-date-picker>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="销售类型" prop="saleTypeId">
+              <el-select
+                v-model="screenForm.saleTypeId"
+                filterable
+                placeholder="选择销售类型"
+                style="width: 100%"
+              >
+                <el-option label="全部" value="" />
+                <el-option
+                  v-for="item in ztypeList"
+                  :key="item.id"
+                  :label="item.saleName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="产品类别" prop="k3CategoryNumber">
+              <el-select
+                v-model="screenForm.k3CategoryNumber"
+                placeholder="请选择产品类别"
+              >
+                <el-option label="全部" value="" />
+                <el-option
+                  v-for="item in dictList"
+                  :label="item.name"
+                  :value="item.number"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="规格型号" prop="specification">
+              <el-input
+                v-model="screenForm.specification"
+                placeholder="请输入规格型号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="screenForm.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="24" :lg="24" class="tr">
+            <el-form-item label="">
+              <el-button size="mini" @click="resetScreenForm">清空</el-button>
+              <el-button size="mini" type="primary" @click="submitScreenForm"
+                >搜索</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div>
+        <el-popconfirm
+          v-if="$checkBtnRole('del', $route.meta.roles)"
+          confirm-button-text="好的"
+          cancel-button-text="不用了"
+          icon="el-icon-info"
+          icon-color="red"
+          title="内容确定删除吗？"
+          @onConfirm="handleDelete"
+        >
+          <el-button
+            type="primary"
+            size="mini"
+            icon="el-icon-delete"
+            slot="reference"
+            class="el-popover-left"
+            >删除</el-button
+          >
+        </el-popconfirm>
+        <el-button
+          type="primary"
+          style="margin-left: 10px"
+          size="mini"
+          @click="handleRevokeAll"
+          >批量作废</el-button
+        >
+        <ExportButton
+          :exUrl="'/product-upd-price/export'"
+          :exParams="exParams"
+          class="exp"
+        />
+        <!-- <el-button type="primary" size="mini">打印</el-button> -->
+      </div>
+      <div class="fl">
+        <!-- <el-popconfirm
+                style="margin-right: 10px"
+                title="批量作废吗？"
+                @onConfirm="handleRevokeAll"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="mini"
+                >批量作废</el-button>
+
+                </el-popconfirm> -->
+      </div>
+    </div>
+
+    <div class="mymain-container">
+      <!-- 列表 -->
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          :row-class-name="tableRowClassName"
+          @select-all="hanleSelectAll"
+          @select="hanleSelectAll"
+        >
+          <el-table-column
+            type="selection"
+            align="left"
+            width="50"
+          ></el-table-column>
+          <!--          <el-table-column type="selection" align="left" />-->
+          <!-- <el-table-column
+            align="left"
+            label="产品类别"
+            prop="mainName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column> -->
+          <el-table-column
+            align="left"
+            label="物料编码"
+            prop="materialNumber"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialNumber" />
+              <span>{{ scope.row.materialNumber }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="产品编码"
+            prop="materialOldNumber"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialOldNumber" />
+              <span>{{ scope.row.materialOldNumber }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="产品名称"
+            prop="materialName"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialName" />
+              <span>{{ scope.row.materialName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="规格型号"
+            prop="specification"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.specification" />
+              <span>{{ scope.row.specification }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="销售类型"
+            prop="saleTypeName"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="单位"
+            prop="unit"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="数量下限"
+            prop="qty"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="返利类型（钱包）"
+            prop="wallets"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <template v-for="(item, index) in scope.row.wallets">
+                <template v-if="item.type === 'REBATE'">
+                  <el-tag
+                    :key="index"
+                    type="success"
+                    style="margin: 0 10px"
+                    size="mini"
+                  >
+                    {{ item.walletName }}
+                  </el-tag>
+                </template>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="现金钱包"
+            prop="modifyPriceDepartment"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <template v-for="(item, index) in scope.row.wallets">
+                <template v-if="item.type === 'COMMONLY'">
+                  <el-tag
+                    :key="index"
+                    type="success"
+                    style="margin: 0 10px"
+                    size="mini"
+                  >
+                    {{ item.walletName }}
+                  </el-tag>
+                </template>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="生效日期"
+            prop="startDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+
+          <el-table-column
+            align="left"
+            label="失效日期"
+            prop="endDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="是否销价"
+            prop="isPromote"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-tag size="mini" v-if="scope.row.isPromote" type="success"
+                >是</el-tag
+              >
+              <el-tag size="mini" v-else type="danger">否</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="是否作废"
+            prop="isRevoke"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-tag size="mini" v-if="scope.row.isRevoke" type="success"
+                >是</el-tag
+              >
+              <el-tag size="mini" v-else type="danger">否</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="right"
+            label="批发价1"
+            prop="batchPrice"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="right"
+            label="格力折扣"
+            prop="discAmount"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="备注"
+            prop="remark"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column fixed="left" width="150" label="操作" align="center">
+            <template slot-scope="scope">
+              <el-popconfirm
+                v-if="!scope.row.isRevoke"
+                style="margin-right: 10px"
+                title="作废吗？"
+                @onConfirm="handleRevoke(scope.row.id)"
+              >
+                <el-button slot="reference" type="text" size="mini"
+                  >作废</el-button
+                >
+              </el-popconfirm>
+
+              <el-button
+                v-if="$checkBtnRole('del', $route.meta.roles)"
+                type="text"
+                size="mini"
+                @click="handleDelete(scope.row.id)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="listTotal"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Mixin from "@/mixin/index";
+import {
+  getProductDelete,
+  getProductPriceList,
+  getTypeList,
+  handlePriceRevoke,
+} from "@/api/basic_data/material";
+import { getCategoryList } from "@/api/common";
+import ExportButton from "@/components/Common/export-button.vue";
+
+export default {
+  mixins: [Mixin],
+  data() {
+    return {
+      currentPage: 1,
+      pageSize: 10,
+      listTotal: 0,
+      dataList: [],
+      screenForm: {
+        k3CategoryNumber: "",
+        endDate: "",
+        materialName: "",
+        materialNumber: "",
+        materialOldNumber: "",
+        saleTypeId: "",
+        specification: "",
+        startDate: "",
+        remark: "",
+      },
+      ztypeList: [],
+      dictList: {},
+    };
+  },
+  computed: {
+    exParams() {
+      return {
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        endDate: this.screenForm.endDate,
+        materialName: this.screenForm.materialName,
+        materialNumber: this.screenForm.materialNumber,
+        materialOldNumber: this.screenForm.materialOldNumber,
+        saleTypeId: this.screenForm.saleTypeId,
+        specification: this.screenForm.specification,
+        startDate: this.screenForm.startDate,
+        remark: this.screenForm.remark,
+        billType: "DIFF",
+      };
+    },
+  },
+  mounted() {
+    getCategoryList({ pageNum: 1, pageSize: -1 }).then((res) => {
+      this.dictList = res.data.records;
+      console.log(this.dictList, 777777);
+    });
+  },
+  methods: {
+    addFn() {
+      this.showDialogForm = true;
+    },
+    handleDelete(id) {
+      this.hanleDeleteAllPromise(id).then((ids) => {
+        getProductDelete(ids).then((res) => {
+          this.$successMsg("删除成功");
+          this.getList();
+        });
+      });
+    },
+    getList() {
+      this.listLoading = true;
+      const params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        endDate: this.screenForm.endDate,
+        materialName: this.screenForm.materialName,
+        materialNumber: this.screenForm.materialNumber,
+        materialOldNumber: this.screenForm.materialOldNumber,
+        saleTypeId: this.screenForm.saleTypeId,
+        specification: this.screenForm.specification,
+        startDate: this.screenForm.startDate,
+        remark: this.screenForm.remark,
+        billType: "DIFF",
+      };
+      getProductPriceList(params).then((res) => {
+        this.dataList = res.data.records;
+        console.log(res.data.records);
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      });
+      getTypeList({ ...params, pageNum: 1, pageSize: -1 }).then((res) => {
+        this.ztypeList = res.data.records;
+        // console.log(this.ztypeList, "type1111");
+      });
+    },
+    handleRevoke(id) {
+      handlePriceRevoke({ ids: id }).then((res) => {
+        this.$successMsg("操作成功");
+        this.getList();
+      });
+    },
+    handleRevokeAll() {
+      handlePriceRevoke({ ids: this.ids.join("") }).then((res) => {
+        this.$successMsg("操作成功");
+        this.getList();
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      // || row.examineStatus=='FAIL'
+      if (this.ids.includes(row.id)) {
+        return "warning-row";
+      }
+      return "";
+    },
+  },
+  components: { ExportButton },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-table .warning-row {
+  background: oldlace;
+}
+
+::v-deep .el-select--small {
+  width: 100%;
+}
+::v-deep .el-date-editor {
+  width: 100%;
+}
+.exp {
+  display: inline-block;
+  margin-left: 10px;
+}
+</style>

src/views/supply/price/modify_list.vue

@@ -190,7 +190,7 @@
             @select-all="hanleSelectAll"
             @select="hanleSelectAll"
             :row-class-name="tableRowClassName"
-            
+
           >
             <el-table-column
               type="selection"
@@ -841,7 +841,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  
+
   ::v-deep .el-table .warning-row {
     background:  oldlace;
   }

src/views/supply/price/price_list.vue

@@ -164,8 +164,8 @@
                 </el-popconfirm> -->
         </div>
     </div>
-           
- 
+
+
     <div class="mymain-container">
       <!-- 列表 -->
       <div class="table">
@@ -482,7 +482,7 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
-      getTypeList(params).then((res) => {
+      getTypeList({...params,pageNum:1,pageSize:-1}).then((res) => {
         this.ztypeList = res.data.records
         // console.log(this.ztypeList, "type1111");
       })

src/views/supply/reserve/reserve_list.vue

@@ -78,7 +78,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -91,8 +91,10 @@
 
       <div class="mymain-container">
         <div class="btn-group clearfix">
-          <div class="fl">
+          <div class="fl flex" >
             <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <ExportButton class="ml" :exUrl="'/reserve/download'" exText="下载模板" :exParams="{}" />
+            <ImportButton :imUrl="'/reserve/importData'" @importSuccess="getList" />
           </div>
           <div class="fr">
             <ExportButton :exUrl="'reserve/export'" :exParams="exParams" />
@@ -101,11 +103,11 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
@@ -185,9 +187,9 @@
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles)">编辑</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-popconfirm
-                  style="margin-left: 10px;" 
-                  title="确定关闭吗？" 
-                  @onConfirm="handleClose(scope.row.itemId)" 
+                  style="margin-left: 10px;"
+                  title="确定关闭吗？"
+                  @onConfirm="handleClose(scope.row.itemId)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.status === 1">
                   <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
@@ -210,7 +212,7 @@
         </div>
       </div>
     </div>
-    
+
     <ReserveDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <ReserveForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
 
@@ -397,5 +399,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.flex{
+  display: flex;
+}
+.ml{
+  margin-left: 10px;
+}
 </style>

vue.config.js

@@ -51,24 +51,18 @@ module.exports = {
     before: require('./mock/mock-server.js')
   },
   configureWebpack: {
+    // provide the app's title in webpack's name field, so that
+    // it can be accessed in index.html to inject the correct title.
+    name: name,
     plugins: [
       new webpack.ProvidePlugin({
       }),
     ],
     resolve: {
       alias: {
+        '@': resolve('src')
       },
       extensions: ['*', '.js', '.vue', '.json']
-    },
-  },
-  configureWebpack: {
-    // provide the app's title in webpack's name field, so that
-    // it can be accessed in index.html to inject the correct title.
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
     }
   },
   chainWebpack(config) {