Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/supply/engin/components/commerce_form.vue

src/api/basic_data/dealer.js

@@ -154,3 +154,11 @@ export function getCustomerDepositDetailList(params) {
     params,
   });
 }
+//获取经销商
+export function getListCustomer(params) {
+  return request({
+    url: "/pick/listCustomer",
+    method: "get",
+    params,
+  });
+}

src/api/supply/pickup.js

@@ -111,7 +111,7 @@ export function getPickupManInfo(params) {
 // 增加打印次数
 export function addPrint(params) {
   return request({
-    url: '/pick/printAdd',
+    url: '/invoice/printInvoice',
     method: 'post',
     params
   })
@@ -142,4 +142,4 @@ export function cancelData(params) {
     method: 'post',
     params
   })
-}
+}

src/components/Common/check-order.vue

@@ -31,8 +31,8 @@
         <el-table-column align="center" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="客户名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" 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="right" label="无税金额" prop="noTotalAmount" min-width="100" show-overflow-tooltip>
@@ -113,4 +113,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-</style>
+</style>

src/components/Common/print-common.vue

@@ -32,10 +32,11 @@
             <el-col :span="2">发货单号</el-col>
             <el-col :span="2">发货日期</el-col>
             <el-col :span="2">订单号</el-col>
-            <el-col :span="2">工程编号</el-col>
+            <!-- <el-col :span="2">工程编号</el-col> -->
             <el-col :span="4">存货名称</el-col>
-            <el-col :span="8">规格型号</el-col>
+            <el-col :span="6">规格型号</el-col>
             <el-col :span="2">数量</el-col>
+            <el-col :span="2">备注说明</el-col>
           </el-row>
         </div>
         <div class="body">
@@ -44,11 +45,12 @@
               <el-col :span="2">{{ it.salesId }}</el-col>
               <el-col :span="2">{{ it.invoiceId }}</el-col>
               <el-col :span="2">{{ it.id ? dateToDayFilter(item.orderTime) : '' }}</el-col>
-              <el-col :span="2">{{ it.mainOrderId }}</el-col>
-              <el-col :span="2">{{ it.refEnginRecordNo }}</el-col>
+              <el-col :span="2">{{ it.orderId }}</el-col>
+              <!-- <el-col :span="2">{{ it.refEnginRecordNo }}</el-col> -->
               <el-col :span="4">{{ it.materialName }}</el-col>
-              <el-col :span="8">{{ it.specification }}</el-col>
+              <el-col :span="6">{{ it.specification }}</el-col>
               <el-col :span="2">{{ it.refundableQty }}</el-col>
+               <el-col :span="2">{{ it.pjxh1Text }}</el-col>
             </el-row>
           </div>
         </div>
@@ -147,7 +149,7 @@ export default {
       console.log(showData);
       return showData;
     },
-    
+
     nowDate() {
       var date = new Date();
       var seperator1 = "-";
@@ -307,4 +309,4 @@ export default {
     }
   }
 
-</style>
+</style>

src/components/Common/print-foshan.vue

@@ -134,7 +134,7 @@ export default {
       console.log(showData);
       return showData;
     },
-    
+
     nowDate() {
       var date = new Date();
       var seperator1 = "-";
@@ -297,4 +297,4 @@ export default {
     }
   }
 
-</style>
+</style>

src/views/basic_data/dealer/dealer_deposit.vue

@@ -98,7 +98,7 @@
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" 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>
@@ -366,9 +366,9 @@ export default {
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
-      this.currentPage = 1;
+
       this.getList({
-        pageNum: 1,
+        pageNum: this.currentPage,
         pageSize: this.pageSize,
         keyword: this.searchForm.customerName,
         currentStatus: this.searchForm.currentStatus,
@@ -378,8 +378,8 @@ export default {
     handleCurrentChange(val) {
       this.currentPage = val;
       this.getList({
-        pageNum: val,
-        pageSize: 10,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
         keyword: this.searchForm.customerName,
         currentStatus: this.searchForm.currentStatus,
       });
@@ -391,7 +391,7 @@ export default {
         keyword: this.searchForm.customerName,
         currentStatus: this.searchForm.currentStatus,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: this.pageSize,
       });
     },
     //重置
@@ -423,6 +423,9 @@ export default {
       this.dialogForm.customerName = res.name;
       this.dialogForm.customerNumber = res.number;
 
+      if (!this.dialogForm.endTime) {
+        this.dialogForm.endTime = "2100-01-01 00:00:00";
+      }
       if (this.dialogForm.id) {
         await editDealerDeposit({
           ...this.dialogForm,
@@ -430,9 +433,6 @@ export default {
         });
         this.$message.success("编辑成功");
       } else {
-        if (this.dialogForm.endTime === "") {
-          this.dialogForm.endTime = "2100-01-01 00:00:00";
-        }
         await getDealerDepositAdd({
           ...this.dialogForm,
           rate: Number(this.dialogForm.rate / 100),

src/views/basic_data/dealer/dealer_stock.vue

@@ -70,7 +70,7 @@
       </div>
       <!-- 分页 -->
       <div class="fr">
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" 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>
@@ -558,9 +558,9 @@ export default {
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
-      this.currentPage = 1;
+      // this.currentPage = 1
       this.getList({
-        pageNum: 1,
+        pageNum: this.currentPage,
         pageSize: this.pageSize,
         customerName: this.searchForm.customerName,
       });
@@ -569,18 +569,19 @@ export default {
     handleCurrentChange(val) {
       this.currentPage = val;
       this.getList({
-        pageNum: val,
-        pageSize: 10,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
         customerName: this.searchForm.customerName,
       });
     },
     //搜索功能
     async searchFn() {
-      console.log(this.searchForm);
+      // console.log(this.searchForm);
+      this.currentPage = 1;
       await this.getList({
         customerName: this.searchForm.customerName,
-        pageNum: 1,
-        pageSize: 10,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
       });
     },
     //重置

src/views/basic_data/material/price_list.vue

@@ -356,7 +356,7 @@
                 v-if="!scope.row.isRevoke"
                 style="margin-right: 10px"
                 title="作废吗？"
-                @click="handleRevoke(scope.row.id)"
+                @onConfirm="handleRevoke(scope.row.id)"
               >
                 <el-button
                   slot="reference"

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

@@ -49,15 +49,16 @@
               </div>
             </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">厂工程编码</div>
+            <div class="label">厂编号</div>
             <div class="value">
-              <el-form-item prop="refFactoryNo">
+               {{ details.refFactoryNo }}
+              <!-- <el-form-item prop="refFactoryNo">
                 <el-input
                   v-model="details.refFactoryNo"
-                  placeholder="厂工程编码"
+                  placeholder="厂编号"
                   size="small"
                 />
-              </el-form-item>
+              </el-form-item> -->
             </div>
           </el-col>
 

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

@@ -87,7 +87,7 @@
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
 <el-col :xs="24" :sm="24" :lg="12" class="item">
-              <div class="label">跨区厂编号</div>
+              <div class="label">厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
@@ -148,7 +148,7 @@
 
             <el-table-column
               align="left"
-              label="跨区厂编号"
+              label="厂编号"
               prop="factoryNo"
               min-width="160"
               show-overflow-tooltip
@@ -419,7 +419,7 @@
             <div class="value">{{ details.checkBy }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
-            <div class="label">验收日期</div>
+            <div class="label">受理日期</div>
             <div class="value">{{ details.checkDate }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -762,7 +762,7 @@
           >
             <el-table-column
               align="left"
-              label="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip

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

@@ -227,7 +227,7 @@
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">验收日期</div>
+          <div class="label">受理日期</div>
           <div class="value">
             <el-date-picker type="date" placeholder=""> </el-date-picker>
           </div>
@@ -283,4 +283,4 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+</style>

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

@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">跨区厂编号</div>
+          <div class="label">厂编号</div>
           <div class="value">{{ detailList.refFactoryNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -197,7 +197,7 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-          <el-table-column align="left" label="跨区厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
+          <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>
@@ -329,7 +329,7 @@
           <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="checkBy" 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="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="是否退押" prop="checkBy" 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>
@@ -360,7 +360,7 @@
           <div class="value">{{ this.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>
@@ -393,7 +393,7 @@
           <div class="value">{{ detailList.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>
@@ -702,4 +702,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/deposit_commerce/deposit_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="全部" />
         <el-radio-button label="已退押" />
       </el-radio-group>
-      <br /><br />
+      <br><br>
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -41,10 +41,15 @@
               </el-form-item>
             </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-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="请输入"
+                  placeholder="请输入使用单位"
                 />
               </el-form-item>
             </el-col>
@@ -58,7 +63,7 @@
                 />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
+         <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束申请日期" prop="endSubmitTime">
                 <el-date-picker
                   v-model="screenForm.endSubmitTime"
@@ -68,44 +73,50 @@
                 />
               </el-form-item>
             </el-col>
-
-
-            <el-col :xs="24" :sm="12" :lg="6">
+              <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
+                <el-date-picker
+                  v-model="screenForm.startConfirmTime"
+                  class="dateStyle"
+                  type="datetime"
+                  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"
+                  placeholder="选择日期"
+                />
+              </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-option label="默认" :value="null"></el-option>
+              <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>
-                </el-select>
+                <el-option v-for="item in refundDepositArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+   <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.examineStatus"
-                  placeholder="请选择状态 "
-                >
-                  <el-option label="默认" :value="null"></el-option>
+              <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>
-                </el-select>
+                <el-option v-for="item in examineStatusArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -118,28 +129,8 @@
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </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"
-                  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"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <template v-if="!isCustomer">
-              <el-col :xs="24" :sm="12" :lg="6">
+              <template v-if="!isCustomer">
+                <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="审核人" prop="confirmName">
                   <el-input
                     v-model="screenForm.confirmName"
@@ -155,16 +146,17 @@
                   />
                 </el-form-item>
               </el-col>
-                 <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期"   style="margin-bottom:0">
+
+                   <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期" style="margin-bottom:0">
                   <div class="fanwei">
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
-                        v-model="screenForm.startInstallTime"
-                        class="dateStyle"
-                        type="datetime"
-                        placeholder="选择日期"
-                      />
+                  v-model="screenForm.startInstallTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
 
                      </el-form-item>
                       <span>-</span>
@@ -180,58 +172,47 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="规格型号" prop="specification">
-                        <el-input  v-model="screenForm.specification" ></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" ></el-input>
+                        <el-input  v-model="screenForm.specialNo" placeholder="请输入特价编号" ></el-input>
 
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+               <el-form-item label="厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.refFactoryNo" ></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="产品编码" >
-                  <div class="fanwei">
-                     <el-form-item prop="startMaterialOldNumber">
-                        <el-input type="startMaterialOldNumber" ></el-input>
-                     </el-form-item>
 
-                  <span>-</span>
-                    <el-form-item prop="endMaterialOldNumber">
-                    <el-input type="endMaterialOldNumber" ></el-input>
-                     </el-form-item>
-                  </div>
-
-                </el-form-item>
-
-
-              </el-col> -->
 
-            </template>
+              </template>
             <el-col :xs="24" :sm="24" :lg="24">
-             <div class="fl">
+    <div class="fl">
           <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
           <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
         </div>
               <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetScreenForm">清空</el-button>
-                <el-button size="mini" type="primary" @click="submitScreenForm"
-                  >搜索</el-button
-                >
+                <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>
@@ -239,9 +220,11 @@
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix" style="display: flex">
-        <el-button type="primary" size="mini" @click="hanleDownloadFiles"
-          >导出</el-button
-        >
+        <el-button
+          type="primary"
+          size="mini"
+          @click="hanleDownloadFiles"
+        >导出</el-button>
         <el-upload
           v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
@@ -284,16 +267,16 @@
               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="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip
@@ -322,7 +305,7 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-             <el-table-column
+              <el-table-column
               align="left"
               label="规格型号"
               prop="specification"
@@ -346,8 +329,7 @@
                   v-if="scope.row.isRefundDeposit"
                   type="success"
                   size="small"
-                  >是</el-tag
-                >
+                >是</el-tag>
                 <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
@@ -382,32 +364,29 @@
                   v-if="scope.row.examineStatus == 'SAVE'"
                   type="success"
                   size="small"
-                  >保存
+                >保存
                 </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'WAIT'"
                   type="warning"
                   size="small"
-                  >待审核
+                >待审核
                 </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'OK'"
                   type="warning"
                   size="mini"
-                  >通过</el-tag
-                >
+                >通过</el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'FAIL'"
                   type="warning"
                   size="small"
-                  >不通过</el-tag
-                >
+                >不通过</el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'CLOSE'"
                   type="warning"
                   size="small"
-                  >关闭</el-tag
-                >
+                >关闭</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -417,7 +396,7 @@
               min-width="160"
               show-overflow-tooltip
             />
-            <el-table-column
+              <el-table-column
               align="left"
               label="资料审核日期"
               prop="refDatumAcceptDate"
@@ -437,18 +416,16 @@
                   class="textColor"
                   size="mini"
                   @click="detailFn(scope.row)"
-                  >详情</el-button
-                >
+                >详情</el-button>
                 <el-button
                   v-if="
                     scope.row.examineStatus == 'SAVE' &&
-                    $checkBtnRole('apply', $route.meta.roles)
+                      $checkBtnRole('apply', $route.meta.roles)
                   "
                   type="text"
                   class="textColor"
                   @click="surrenderFn(scope.row)"
-                  >申请退押</el-button
-                >
+                >申请退押</el-button>
                 <!-- <el-button type="text" class="textColor" slot="reference"
                   >免扣退押</el-button
                 > -->
@@ -477,21 +454,21 @@
 </template>
 
 <script>
-import DepositListDetail from "./components/deposit_list-detail";
-import DepositApplyDeduction from "./components/deposit-apply-deduction.vue";
+import DepositListDetail from './components/deposit_list-detail'
 import {
   getDepositManageDate,
 } from "@/api/engin_deposit/refund_list";
-import DepositApplySurrender from "./components/deposit-apply-surrender.vue";
-import { downloadFiles, handleImport } from "@/utils/util";
-import { getList } from "@/api/engin_deposit.js";
-import Mixin from "@/mixin";
+import DepositApplyDeduction from './components/deposit-apply-deduction.vue'
+import DepositApplySurrender from './components/deposit-apply-surrender.vue'
+import { downloadFiles, handleImport } from '@/utils/util'
+import { getList } from '@/api/engin_deposit.js'
+import Mixin from '@/mixin'
 
 export default {
   components: {
     DepositListDetail,
     DepositApplyDeduction,
-    DepositApplySurrender,
+    DepositApplySurrender
   },
   mixins: [Mixin],
   data() {
@@ -501,77 +478,72 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       screenForm: {
-        confirmName: "", // 审核人
-        createName: "", // 创建人
-        customerKeyword: "", // 客户编码/客户名称
-        endDeliverTime: "", // 发货申请日期-结束
-        enginOrderNo: "", // 工程订单编号
-        enginOrderType: "TRADE", // 工程订单类型
-        examineStatus: "", // 状态
-        refEnginRecordNo: "", // 登录单号
-        refProjectName: "", // 项目名称
-        refUseUnit: "", // 使用单位
-        startDeliverTime: "", // 发货申请日期-开始
-        startSubmitTime: "",
-        startConfirmTime: "",
-        isRefundDeposit: null,
-        startInstallTime: "",
-        endConfirmTime: "",
-        endInstallTime: "",
+        confirmName: '', // 审核人
+        createName: '', // 创建人
+        customerKeyword: '', // 客户编码/客户名称
+        endDeliverTime: '', // 发货申请日期-结束
+        enginOrderNo: '', // 工程订单编号
+        enginOrderType: 'TRADE', // 工程订单类型
+        examineStatus: '', // 状态
+        refEnginRecordNo: '', // 登录单号
+        refProjectName: '', // 项目名称
+        refTradeCategory: '',
+        refUseUnit: '', // 使用单位
+        startDeliverTime: '', // 发货申请日期-开始
+        startSubmitTime:'',
+        startConfirmTime:'',
+        isRefundDeposit:null,
+        endConfirmTime:'',
+        startInstallTime:'',
+        endInstallTime:'',
         specification:'',
         refFactoryNo:'',
-        factoryNo: "",
-        specialNo: "",
-        refRegionWork: "",
-        endSubmitTime:'',
+        factoryNo:'',
+        specialNo:'',
+        refRegionWork:'',
+        endSubmitTime:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
-      deduction: "全部",
+      deduction: '全部',
       showPage: 1,
       importFileList: [],
       selectData: [],
-      baseURL: "",
-      refundDepositArr: [
+      baseURL: '',
+      refundDepositArr:[
         {
-          label: "是",
-          value: true,
+          label:'是',
+          value:true
         },
         {
-          label: "否",
-          value: false,
-        },
+          label:'否',
+          value:false
+        }
       ],
 
-      examineStatusArr: [
-        {
-          label: "保存",
-          value: "SAVE",
+      examineStatusArr:[
+         {
+          label:'保存',
+          value:'SAVE'
         },
         {
-          label: "待审核",
-          value: "WAIT",
+          label:'待审核',
+          value:'WAIT'
         },
         {
-          label: "通过",
-          value: "OK",
+          label:'通过',
+          value:'OK'
         },
         {
-          label: "不通过",
-          value: "FAIL",
+          label:'关闭',
+          value:'CLOSE'
         },
-        {
-          label: "关闭",
-          value: "CLOSE",
-        },
-      ],
-    };
+      ]
+    }
   },
-  computed: {
-    isCustomer() {
-      return (
-        this.$store.getters.customerId && this.$store.getters.customerNumber
-      );
-    },
+  computed:{
+    isCustomer(){
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
   },
   methods: {
       //同步资料日期
@@ -581,84 +553,82 @@ export default {
     },
     // 免扣申请
     deductionFn() {
-      this.showPage = 3;
+      this.showPage = 3
     },
     // 申请退押
     surrenderFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.showPage = 4;
+      this.depositManageId = row.depositManageId
+      this.showPage = 4
     },
     detailFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.refEnginRecordNo = row.refEnginRecordNo;
-      this.showPage = 2;
+      this.depositManageId = row.depositManageId
+      this.refEnginRecordNo = row.refEnginRecordNo
+      this.showPage = 2
     },
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
+
       const params = {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        isRefundDeposit: this.deduction === "已退押" ? true : null,
-        ...this.screenForm,
-      };
+        isRefundDeposit: '',
+        ...this.screenForm
+      }
+      params.isRefundDeposit = this.deduction === '已退押' ? true : ''
 
       getList(params).then((res) => {
-        this.dataList = res.data.records;
+        this.dataList = res.data.records
         res.data.records.forEach((item) => {
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-          item.sums1 = ["qty"];
-          item.sums2 = ["depositAmount", "diffAmount", "price"];
-        });
-        this.listLoading = false;
-        this.listTotal = res.data.total;
-      });
+          item.sums1 = ['qty']
+          item.sums2 = ['depositAmount', 'diffAmount', 'price']
+        })
+        this.listLoading = false
+        this.listTotal = res.data.total
+      })
     },
     handleRadio() {
-      this.currentPage = 1;
-      this.getList();
+      this.getList()
     },
     hanleDownloadFiles() {
       if (this.selectData.length) {
-        const arr = [];
+        const arr = []
         for (let i = 0; i < this.selectData.length; i++) {
-          arr.push(this.selectData[i].depositManageId);
+          arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles("/deposit-manage/export", {
-          id: arr,
-          orderType: "TRADE",
-        });
+        downloadFiles('/deposit-manage/export', { id: arr, orderType:'TRADE' })
       } else {
-        this.$errorMsg("请选择押金项");
+        this.$errorMsg('请选择押金项')
       }
     },
     // 导入
     async handleImport(param) {
-      this.importLoading = true;
-      const file = param.file;
-      console.log(file, 123);
-      const formData = new FormData();
-      formData.append("file", file);
+      this.importLoading = true
+      const file = param.file
+      console.log(file, 123)
+      const formData = new FormData()
+      formData.append('file', file)
       // formData.append("policyId", this.screenForm.code);
-      const result = await handleImport("deposit-manage/import", formData);
-      this.importLoading = false;
-      this.importFileList = [];
+      const result = await handleImport('deposit-manage/import', formData)
+      this.importLoading = false
+      this.importFileList = []
       if (result.code == 200) {
-        this.$alert(result.message, "导入成功", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入成功', {
+          confirmButtonText: '确定'
+        })
 
-        this.handletwoList();
+        this.handletwoList()
       } else {
-        this.$alert(result.message, "导入失败", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入失败', {
+          confirmButtonText: '确定'
+        })
       }
     },
     handleSelectionAllChange(e) {
-      this.selectData = e;
-    },
-  },
-};
+      this.selectData = e
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/deposit_commerce/refund_list.vue

@@ -11,116 +11,232 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="120px" size="mini" label-position="left">
-          <el-row :gutter="10">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="120px"
+          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="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
+                <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="searchForm.customerKeyword" placeholder="请输入"></el-input>
+              <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                <el-input
+                  v-model="screenForm.customerKeyword"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="customerKeyword">
                 <el-input
-                  v-model="searchForm.customerKeyword"
+                  v-model="screenForm.customerKeyword"
                   placeholder="请输入"
                 ></el-input>
               </el-form-item>
             </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refProjectName">
-                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="行业类别" prop="refTradeCategory">
+                <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="confirmName">
-                <el-input v-model="searchForm.confirmName" placeholder="请输入"></el-input>
+              <el-form-item label="使用单位" prop="refUseUnit">
+                <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="specification">
-                <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
+              <el-form-item label="开始申请日期" prop="startSubmitTime">
+                <el-date-picker
+                  v-model="screenForm.startSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="特价编号" prop="specialNo">
-                <el-input v-model="searchForm.specialNo" placeholder="请输入"></el-input>
+             <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="选择日期"
+                />
               </el-form-item>
             </el-col>
+
+
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                <el-input v-model="searchForm.refFactoryNo" placeholder="请输入"></el-input>
+              <el-form-item label="是否退押 " prop="isRefundDeposit">
+                <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>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="安装日期" prop="">
-                <div class="fanwei">
-                  <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                  <span>-</span>
-                  <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                </div>
+              <el-form-item label="状态 " prop="examineStatus">
+                <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>
+                </el-select>
               </el-form-item>
             </el-col>
-
             <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始安装日期" prop="startInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="产品名称" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束安装日期" prop="endInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="规格型号" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请开始日期" prop="startDeliverTime">
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
+                  v-model="screenForm.startConfirmTime"
                   class="dateStyle"
-                  v-model="searchForm.startDeliverTime"
                   type="datetime"
-                  placeholder=""
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请结束日期" prop="endDeliverTime">
+              <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
-                  v-model="searchForm.endDeliverTime"
+                  v-model="screenForm.endConfirmTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder=""
-                  default-time="23:59:59"
-                  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="">
-                <el-input placeholder="请输入"></el-input>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </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-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-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="startInstallTime">
+                          <el-date-picker
+                        v-model="screenForm.startInstallTime"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endInstallTime">
+                                 <el-date-picker
+                  v-model="screenForm.endInstallTime"
+                  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" ></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" ></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" ></el-input>
+
+                </el-form-item>
 
-            <el-col :xs="24" :sm="12" :lg="18">
+              </el-col>
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品编码" >
+                  <div class="fanwei">
+                     <el-form-item prop="startMaterialOldNumber">
+                        <el-input type="startMaterialOldNumber" ></el-input>
+                     </el-form-item>
+
+                  <span>-</span>
+                    <el-form-item prop="endMaterialOldNumber">
+                    <el-input type="endMaterialOldNumber" ></el-input>
+                     </el-form-item>
+                  </div>
+
+                </el-form-item>
+
+
+              </el-col> -->
+
+            </template>
+            <el-col :xs="24" :sm="24" :lg="24">
+             <div class="fl">
+          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">商用工程</el-radio-button>
+          </el-radio-group> -->
+          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+        </div>
               <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetFn">清空</el-button>
+                     <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
@@ -176,7 +292,7 @@
                 <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>
@@ -186,10 +302,10 @@
             </el-table-column>
               <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" 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.refProjectName" />
-                <span>{{scope.row.refProjectName}}</span>
+                <CopyButton :copyText="scope.row.refTradeCategory" />
+                <span>{{scope.row.refTradeCategory}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位
@@ -298,18 +414,65 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-      searchForm: {
-        refEnginRecordNo: "",
-        customerKeyword: "",
-        refProjectName: "",
-        confirmName: "",
-        specification: "",
-        specialNo: "",
-        refFactoryNo: "",
+        screenForm: {
+        confirmName: "", // 审核人
+        createName: "", // 创建人
+        customerKeyword: "", // 客户编码/客户名称
+        endDeliverTime: "", // 发货申请日期-结束
+        enginOrderNo: "", // 工程订单编号
+        enginOrderType: "TRADE", // 工程订单类型
+        examineStatus: "", // 状态
+        refEnginRecordNo: "", // 登录单号
+        refProjectName: "", // 项目名称
+        refUseUnit: "", // 使用单位
+        startDeliverTime: "", // 发货申请日期-开始
+        startSubmitTime: "",
+        startConfirmTime: "",
+        isRefundDeposit: null,
         startInstallTime: "",
+        endConfirmTime: "",
         endInstallTime: "",
+        specification:'',
+        refFactoryNo:'',
+        factoryNo: "",
+        specialNo: "",
         refRegionWork: "",
-      }, //搜索表单
+        endSubmitTime:'',
+        refTradeCategory:''
+      }, // 搜索表单
+       refundDepositArr: [
+        {
+          label: "是",
+          value: true,
+        },
+        {
+          label: "否",
+          value: false,
+        },
+      ],
+
+      examineStatusArr: [
+        {
+          label: "保存",
+          value: "SAVE",
+        },
+        {
+          label: "待审核",
+          value: "WAIT",
+        },
+        {
+          label: "通过",
+          value: "OK",
+        },
+        {
+          label: "不通过",
+          value: "FAIL",
+        },
+        {
+          label: "关闭",
+          value: "CLOSE",
+        },
+      ],
       listLoading: false, // 列表加载loading
       examine: "",
       showSurrender: true,
@@ -321,19 +484,18 @@ export default {
     this.getDataList({
       pageSize: this.pageSize,
       pageNum: this.currentPage,
-      confirmName: "",
-      createName: "",
-      customerKeyword: "",
-      // endDeliverTime: "",
-      enginOrderNo: "",
       enginOrderType: this.enginOrderType,
-      examineStatus: "",
-      refEnginRecordNo: "",
-      refProjectName: "",
-      refUseUnit: "",
+       ...this.screenForm,
       // startDeliverTime: "",
     });
   },
+   computed: {
+    isCustomer() {
+      return (
+        this.$store.getters.customerId && this.$store.getters.customerNumber
+      );
+    },
+  },
   methods: {
     //同步资料日期
     async syncDateFn() {
@@ -366,6 +528,7 @@ export default {
           refEnginRecordNo: "",
           refProjectName: "",
           refUseUnit: "",
+           ...this.screenForm,
           // startDeliverTime: "",
         });
       } else {
@@ -387,6 +550,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -409,6 +573,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -429,6 +594,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -448,6 +614,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -457,16 +624,9 @@ export default {
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        confirmName: "",
-        createName: "",
-        customerKeyword: "",
-        // endDeliverTime: "",
-        enginOrderNo: "",
         enginOrderType: this.enginOrderType,
-        examineStatus: this.examine,
-        refEnginRecordNo: "",
-        refProjectName: "",
-        refUseUnit: "",
+         ...this.screenForm,
+                 examineStatus: this.examine,
         // startDeliverTime: "",
       });
     },
@@ -479,7 +639,7 @@ export default {
         }
         downloadFiles("/deposit-manage/export", {
           id: arr,
-          orderType: "HOME",
+          orderType: "TRADE",
         });
       } else {
         this.$errorMsg("请选择押金项");
@@ -491,12 +651,12 @@ export default {
     },
     //重置
     resetFn() {
-      this.searchForm.startInstallTime = "";
-      this.searchForm.endInstallTime = "";
-      this.$refs.searchForm.resetFields();
-      // this.searchForm.endSpecification = "";
-      // this.searchForm.endSpecialNo = "";
-      // this.searchForm.endRefFactoryNo = "";
+      this.screenForm.startInstallTime = "";
+      this.screenForm.endInstallTime = "";
+      this.$refs.screenForm.resetFields();
+      // this.screenForm.endSpecification = "";
+      // this.screenForm.endSpecialNo = "";
+      // this.screenForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {
@@ -509,7 +669,7 @@ export default {
         enginOrderType: this.enginOrderType,
         examineStatus: this.examine,
         refUseUnit: "",
-        ...this.searchForm,
+        ...this.screenForm,
       });
     },
     //详情

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

@@ -52,7 +52,7 @@
           </el-col>
 
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">跨区厂编号</div>
+            <div class="label">厂编号</div>
             <div class="value">
               {{ details.refFactoryNo }}
 <!--              <el-form-item prop="refFactoryNo">-->

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

@@ -87,7 +87,7 @@
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
 <el-col :xs="24" :sm="24" :lg="12" class="item">
-              <div class="label">跨区厂编号</div>
+              <div class="label">厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
@@ -419,7 +419,7 @@
             <div class="value">{{ details.checkBy }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
-            <div class="label">验收日期</div>
+            <div class="label">受理日期</div>
             <div class="value">{{ details.checkDate }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -762,7 +762,7 @@
           >
             <el-table-column
               align="left"
-              label="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip

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

@@ -227,7 +227,7 @@
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">验收日期</div>
+          <div class="label">受理日期</div>
           <div class="value">
             <el-date-picker type="date" placeholder=""> </el-date-picker>
           </div>
@@ -283,4 +283,4 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+</style>

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

@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">跨区厂编号</div>
+          <div class="label">厂编号</div>
           <div class="value">{{ detailList.refFactoryNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -329,7 +329,7 @@
           <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="checkBy" 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="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="是否退押" prop="checkBy" 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>
@@ -360,7 +360,7 @@
           <div class="value">{{ this.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>
@@ -393,7 +393,7 @@
           <div class="value">{{ detailList.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>

src/views/deposit_home/deposit_list.vue

@@ -74,7 +74,7 @@
               </el-form-item>
             </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始验收日期" prop="startConfirmTime">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
                   class="dateStyle"
@@ -84,7 +84,7 @@
               </el-form-item>
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束验收日期" prop="endConfirmTime">
+              <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
                   class="dateStyle"
@@ -185,9 +185,9 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+               <el-form-item label="厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号" ></el-input>
+                        <el-input  v-model="screenForm.refFactoryNo" placeholder="请输入厂编号" ></el-input>
 
                 </el-form-item>
 
@@ -276,7 +276,7 @@
             />
              <el-table-column
               align="left"
-              label="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip
@@ -534,10 +534,6 @@ export default {
           value:'OK'
         },
         {
-          label:'不通过',
-          value:'FAIL'
-        },
-        {
           label:'关闭',
           value:'CLOSE'
         },

src/views/deposit_home/refund_list.vue

@@ -11,121 +11,232 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="120px" size="mini" label-position="left">
-          <el-row :gutter="10">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="120px"
+          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="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
+                <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="searchForm.customerKeyword" placeholder="请输入"></el-input>
+              <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                <el-input
+                  v-model="screenForm.customerKeyword"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="customerKeyword">
                 <el-input
-                  v-model="searchForm.customerKeyword"
+                  v-model="screenForm.customerKeyword"
                   placeholder="请输入"
                 ></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="refTradeCategory">
-                <el-input v-model="searchForm.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="refProjectName">
-                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="confirmName">
-                <el-input v-model="searchForm.confirmName" placeholder="请输入"></el-input>
+              <el-form-item label="使用单位" prop="refUseUnit">
+                <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="specification">
-                <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
+              <el-form-item label="开始申请日期" prop="startSubmitTime">
+                <el-date-picker
+                  v-model="screenForm.startSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="特价编号" prop="specialNo">
-                <el-input v-model="searchForm.specialNo" placeholder="请输入"></el-input>
+             <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="选择日期"
+                />
               </el-form-item>
             </el-col>
+
+
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="跨区厂编号" prop="startRefFactoryNo">
-                <el-input v-model="searchForm.refFactoryNo" placeholder="请输入"></el-input>
+              <el-form-item label="是否退押 " prop="isRefundDeposit">
+                <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>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="12" :sm="12" :lg="12">
-              <el-form-item label="安装日期" prop="">
-                <div class="fanwei">
-                  <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                  <span>-</span>
-                  <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                </div>
+              <el-form-item label="状态 " prop="examineStatus">
+                <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>
+                </el-select>
               </el-form-item>
             </el-col>
-
             <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始安装日期" prop="startInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="产品名称" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束安装日期" prop="endInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="规格型号" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请开始日期" prop="startDeliverTime">
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
+                  v-model="screenForm.startConfirmTime"
                   class="dateStyle"
-                  v-model="searchForm.startDeliverTime"
                   type="datetime"
-                  placeholder=""
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请结束日期" prop="endDeliverTime">
+              <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
-                  v-model="searchForm.endDeliverTime"
+                  v-model="screenForm.endConfirmTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder=""
-                  default-time="23:59:59"
-                  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="">
-                <el-input placeholder="请输入"></el-input>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </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-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-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="startInstallTime">
+                          <el-date-picker
+                        v-model="screenForm.startInstallTime"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endInstallTime">
+                                 <el-date-picker
+                  v-model="screenForm.endInstallTime"
+                  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" ></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" ></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" ></el-input>
+
+                </el-form-item>
 
-            <el-col :xs="24" :sm="12" :lg="18">
+              </el-col>
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品编码" >
+                  <div class="fanwei">
+                     <el-form-item prop="startMaterialOldNumber">
+                        <el-input type="startMaterialOldNumber" ></el-input>
+                     </el-form-item>
+
+                  <span>-</span>
+                    <el-form-item prop="endMaterialOldNumber">
+                    <el-input type="endMaterialOldNumber" ></el-input>
+                     </el-form-item>
+                  </div>
+
+                </el-form-item>
+
+
+              </el-col> -->
+
+            </template>
+            <el-col :xs="24" :sm="24" :lg="24">
+             <div class="fl">
+          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">商用工程</el-radio-button>
+          </el-radio-group> -->
+          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+        </div>
               <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetFn">清空</el-button>
+                     <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
@@ -181,7 +292,7 @@
                 <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>
@@ -191,10 +302,10 @@
             </el-table-column>
               <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" 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.refProjectName" />
-                <span>{{scope.row.refProjectName}}</span>
+                <CopyButton :copyText="scope.row.refTradeCategory" />
+                <span>{{scope.row.refTradeCategory}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位
@@ -303,22 +414,65 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-      searchForm: {
-        refEnginRecordNo: "",
-        customerKeyword: "",
-        refProjectName: "",
-        refTradeCategory: '',
-        confirmName: "",
-        specification: "",
-        endSpecification: "",
-        specialNo: "",
-        endSpecialNo: "",
-        refFactoryNo: "",
-        endRefFactoryNo: "",
+        screenForm: {
+        confirmName: "", // 审核人
+        createName: "", // 创建人
+        customerKeyword: "", // 客户编码/客户名称
+        endDeliverTime: "", // 发货申请日期-结束
+        enginOrderNo: "", // 工程订单编号
+        enginOrderType: "HOME", // 工程订单类型
+        examineStatus: "", // 状态
+        refEnginRecordNo: "", // 登录单号
+        refProjectName: "", // 项目名称
+        refUseUnit: "", // 使用单位
+        startDeliverTime: "", // 发货申请日期-开始
+        startSubmitTime: "",
+        startConfirmTime: "",
+        isRefundDeposit: null,
         startInstallTime: "",
+        endConfirmTime: "",
         endInstallTime: "",
+        specification:'',
+        refFactoryNo:'',
+        factoryNo: "",
+        specialNo: "",
         refRegionWork: "",
-      }, //搜索表单
+        endSubmitTime:'',
+        refTradeCategory:''
+      }, // 搜索表单
+       refundDepositArr: [
+        {
+          label: "是",
+          value: true,
+        },
+        {
+          label: "否",
+          value: false,
+        },
+      ],
+
+      examineStatusArr: [
+        {
+          label: "保存",
+          value: "SAVE",
+        },
+        {
+          label: "待审核",
+          value: "WAIT",
+        },
+        {
+          label: "通过",
+          value: "OK",
+        },
+        {
+          label: "不通过",
+          value: "FAIL",
+        },
+        {
+          label: "关闭",
+          value: "CLOSE",
+        },
+      ],
       listLoading: false, // 列表加载loading
       examine: "",
       showSurrender: true,
@@ -330,19 +484,18 @@ export default {
     this.getDataList({
       pageSize: this.pageSize,
       pageNum: this.currentPage,
-      confirmName: "",
-      createName: "",
-      customerKeyword: "",
-      // endDeliverTime: "",
-      enginOrderNo: "",
       enginOrderType: this.enginOrderType,
-      examineStatus: "",
-      refEnginRecordNo: "",
-      refProjectName: "",
-      refUseUnit: "",
+       ...this.screenForm,
       // startDeliverTime: "",
     });
   },
+   computed: {
+    isCustomer() {
+      return (
+        this.$store.getters.customerId && this.$store.getters.customerNumber
+      );
+    },
+  },
   methods: {
     //同步资料日期
     async syncDateFn() {
@@ -375,6 +528,7 @@ export default {
           refEnginRecordNo: "",
           refProjectName: "",
           refUseUnit: "",
+           ...this.screenForm,
           // startDeliverTime: "",
         });
       } else {
@@ -396,6 +550,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -418,6 +573,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -438,6 +594,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -457,6 +614,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -466,16 +624,9 @@ export default {
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        confirmName: "",
-        createName: "",
-        customerKeyword: "",
-        // endDeliverTime: "",
-        enginOrderNo: "",
         enginOrderType: this.enginOrderType,
-        examineStatus: this.examine,
-        refEnginRecordNo: "",
-        refProjectName: "",
-        refUseUnit: "",
+         ...this.screenForm,
+                 examineStatus: this.examine,
         // startDeliverTime: "",
       });
     },
@@ -500,12 +651,12 @@ export default {
     },
     //重置
     resetFn() {
-      this.searchForm.startInstallTime = "";
-      this.searchForm.endInstallTime = "";
-      this.$refs.searchForm.resetFields();
-      // this.searchForm.endSpecification = "";
-      // this.searchForm.endSpecialNo = "";
-      // this.searchForm.endRefFactoryNo = "";
+      this.screenForm.startInstallTime = "";
+      this.screenForm.endInstallTime = "";
+      this.$refs.screenForm.resetFields();
+      // this.screenForm.endSpecification = "";
+      // this.screenForm.endSpecialNo = "";
+      // this.screenForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {
@@ -518,7 +669,7 @@ export default {
         enginOrderType: this.enginOrderType,
         examineStatus: this.examine,
         refUseUnit: "",
-        ...this.searchForm,
+        ...this.screenForm,
       });
     },
     //详情

src/views/sales_policy/components/AddCondition.vue

@@ -538,6 +538,7 @@ export default {
   created() {
     this.getCommonApi();
   },
+
   computed: mapState({
     comCode: (state) => state.sales.code,
   }),
@@ -570,11 +571,14 @@ export default {
       // 如果没有返回值则默认返回false(全部无法选中)
     },
     async getCommonApi(policyId) {
+
       if (this.id || policyId) {
-        this.edit = "eidt";
+        if (policyId) {
+           this.edit = "eidt";
+        }
 
         const res = await getConditionMaterialDetail({
-          id: this.policyId || policyId,
+          id: this.policyId || policyId || this.id,
         });
         this.pop = res.data.pop;
         let pop = res.data.pop.split(":");
@@ -624,7 +628,7 @@ export default {
       for (let i = 0; i < this.conditionBox.length; i++) {
         for (let j = 0; j < this.conditionBox[i].length; j++) {
           this.conditionBox[i][j].popType = i + 1;
-          this.conditionBox[i][j].policyId = this.comCode;
+          this.conditionBox[i][j].policyId = this.$parent.searchForm.code || this.comCode;
           this.conditionBox[i][j].id = "";
           //  this.conditionBox[i][j].policyMaterialId =this.conditionBox[i][j].materialId
         }

src/views/sales_policy/components/Examine.vue

@@ -641,6 +641,16 @@
             <span>{{ scope.row.materialNumber }}</span>
           </template>
         </el-table-column>
+                <el-table-column
+          prop="examineOrderNums"
+          label="已审订单数
+"
+          align="left"
+        >
+        <template slot-scope="scope">
+          {{scope.row.examineOrderNums | numToFixed }}
+        </template>
+        </el-table-column>
         <el-table-column
           prop="limitQty"
           label="购买量上限
@@ -648,6 +658,9 @@
 "
           align="left"
         >
+          <template slot-scope="scope">
+          {{scope.row.limitQty | numToFixed }}
+        </template>
         </el-table-column>
       </el-table>
       </div>

src/views/sales_policy/components/TabelTransfer.vue

@@ -229,6 +229,19 @@
             <span>{{ scope.row.materialNumber }}</span>
           </template>
         </el-table-column>
+
+      <el-table-column
+          prop="examineOrderNums"
+          label="已审订单数
+"
+          align="left"
+        >
+        <template slot-scope="scope">
+          {{scope.row.examineOrderNums | numToFixed }}
+        </template>
+        </el-table-column>
+
+
         <el-table-column
           prop="limitQty"
           label="购买量上限
@@ -236,6 +249,9 @@
 "
           align="left"
         >
+           <template slot-scope="scope">
+          {{scope.row.limitQty | numToFixed }}
+        </template>
         </el-table-column>
       </el-table>
       </div>

src/views/sales_policy/components/details.vue

@@ -660,6 +660,17 @@
             <span>{{ scope.row.materialNumber }}</span>
           </template>
         </el-table-column>
+              <el-table-column
+          prop="examineOrderNums"
+          label="已审订单数
+"
+          align="left"
+        >
+        <template slot-scope="scope">
+          {{scope.row.examineOrderNums | numToFixed }}
+        </template>
+        </el-table-column>
+
         <el-table-column
           prop="limitQty"
           label="购买量上限
@@ -667,6 +678,9 @@
 "
           align="left"
         >
+           <template slot-scope="scope">
+          {{scope.row.limitQty | numToFixed }}
+        </template>
         </el-table-column>
       </el-table>
       </div>

src/views/sales_policy/components/editPolicy.vue

@@ -440,6 +440,13 @@
                   size="mini"
                   @click="handleCondition(scope.row.id, scope.$index)"
                 >删除</el-button>
+                 <el-button
+                  type="text"
+                  size="mini"
+                  @click="
+                  catCond(scope.row)
+                  "
+                >查看条件</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -464,6 +471,8 @@
 
       @handleSubmitCon="handleSubmitCon"
     />
+    <AddCondition ref="cond" v-show="isCondition === 2"   :id="cid"  />
+
   </div>
 </template>
 
@@ -489,6 +498,8 @@ import { downloadFiles, handleImport } from '@/utils/util'
 // import Transfer from './Transfer'
 import TabelTransfer from './TabelTransfer'
 import AddCondition from './AddCondition'
+import EditCondition from './EditCondition'
+
 import ImageUpload from '@/components/Common/image-upload.vue'
 
 export default {
@@ -585,6 +596,7 @@ export default {
     if (this.$parent.isFlag) {
       // this.handletwoList()
     }
+
   },
   methods: {
     ...mapMutations('sales', ['initData']),
@@ -602,6 +614,15 @@ export default {
         this.$successMsg('删除成功')
       })
     },
+    catCond(row){
+      this.cid = row.id
+      this.$refs.cond.getCommonApi()
+      this.isCondition = 2
+
+            // $refs.cond.getCommonApi(),
+            //         (), (cid = scope.row.id)
+
+    },
     handleAddCondition() {
       this.isCondition = 1
       console.log(this.conditionList[0].id,this.searchForm.code);
@@ -1017,6 +1038,7 @@ export default {
     // Transfer,
     AddCondition,
     ImageUpload,
+    EditCondition,
     TabelTransfer
   }
 }

src/views/sales_policy/policy_list.vue

@@ -186,7 +186,14 @@
     </div>
     <div class="mymain-container">
       <div class="table">
-      <el-table :data="dataList" border style="width: 100%" class="table">
+      <el-table
+
+      :data="dataList"
+        :row-class-name="tableRowClassName"
+      border
+
+      style="width: 100%"
+     >
         <el-table-column
           fixed="left"
           label="操作"
@@ -472,6 +479,13 @@ export default {
     comCode: (state) => state.sales.code
   }),
   methods: {
+    tableRowClassName({row, rowIndex}) {
+      // || row.examineStatus=='FAIL'
+     if (row.status == 0 ) {
+          return 'warning-row';
+        }
+        return '';
+    },
     hanlenewInfo() {
       console.log()
       getId().then((res) => {
@@ -603,6 +617,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+ ::v-deep .el-table .warning-row {
+    background:  oldlace;
+  }
+  // ::v-deep  .el-table .success-row {
+  //   background: #f0f9eb;
+  // }
 .btn {
   width: 80px;
 }

src/views/setting/account.vue

@@ -21,22 +21,22 @@
         <!-- <div class="top clearfix">
           <div class="title fl">条件筛选</div>
         </div> -->
-        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="150px" size="mini" label-position="left">
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="账号名称" prop="name">
-                <el-input v-model="screenForm.name" placeholder="请输入账号名称"></el-input>
+            <el-col :xs="24" :sm="12" :lg="8">
+              <el-form-item label="账号/用户名名称:" prop="name">
+                <el-input v-model="screenForm.name" placeholder="请输入账号/用户名名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="角色" prop="roleId">
+            <el-col :xs="24" :sm="12" :lg="8">
+              <el-form-item label="角色:" prop="roleId">
                 <el-select class="selectStyle" v-model="screenForm.roleId" placeholder="请选择" filterable>
                   <el-option v-for="(v, i) in roleList" :key="i" :label="v.name" :value="v.adminRoleId">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-col :xs="24" :sm="12" :lg="8" class="tr">
               <el-form-item label="">
                 <el-button size="mini" @click="resetScreenForm">清空</el-button>
                 <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -632,6 +632,7 @@ export default {
 
           if (this.roleObj.type === 0) {
             params.adminWebsitIds = this.$refs.tree.getCheckedKeys();
+            params.roleName = this.roleObj.name;
             if (this.roleObj.name === "经销商") {
               params.customerId = this.AccountForm.dealer;
               params.isGroupCompany = this.AccountForm.isGroup;

src/views/supply/apply/components/apply_examine.vue

@@ -95,7 +95,7 @@
         <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.approvalNumber" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
@@ -143,7 +143,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
@@ -304,4 +304,4 @@ export default {
   ::v-deep input[type='number'] {
     -moz-appearance: textfield;
   }
-</style>
+</style>

src/views/supply/apply/components/engin_detail.vue

@@ -37,6 +37,8 @@
             <div class="label">项目类别</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
+
+
           <el-col :span="8" class="item">
             <div class="label">工程登录类型</div>
             <div class="value">{{detailData.enginOrderType | enginTypeFilter}}</div>
@@ -49,9 +51,9 @@
             <div class="label">使用单位</div>
             <div class="value">{{detailData.refUseUnit}}</div>
           </el-col>
-          <el-col :span="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
+           <el-col :span="8" class="item">
+            <div class="label">行业类别</div>
+            <div class="value">{{detailData.refTradeCategory}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">联系人</div>

src/views/supply/apply/components/engin_examine.vue

@@ -36,6 +36,7 @@
           <div class="label">项目类别</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
+
         <el-col :span="8" class="item">
           <div class="label">工程登录类型</div>
           <div class="value">{{detailData.enginOrderType | enginTypeFilter}}</div>
@@ -48,10 +49,10 @@
           <div class="label">使用单位</div>
           <div class="value">{{detailData.refUseUnit}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label"></div>
-          <div class="value"></div>
-        </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">行业类别</div>
+            <div class="value">{{detailData.refTradeCategory}}</div>
+          </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
           <div class="value">{{detailData.refLinkman}}</div>
@@ -64,6 +65,7 @@
           <div class="label">移动电话</div>
           <div class="value">{{detailData.refPhone}}</div>
         </el-col>
+
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
           <div class="value">{{detailData.refInstallAddress}}</div>
@@ -126,8 +128,18 @@
         <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="160" 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="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+
+  <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.price | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.totalAmount | numToFixed }}
+          </template>
+        </el-table-column>        <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+
         <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>

src/views/supply/apply/components/engin_form.vue

@@ -50,8 +50,13 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="项目类别" prop="enginName">
-            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别" :disabled="isDealer"></el-input>
+          <el-form-item label="家用项目类别" prop="enginName">
+            <el-input v-model="mainForm.enginName" placeholder="请输入家用项目类别" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col>
+            <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="商用项目名称" prop="refProjectName">
+            <el-input v-model="mainForm.refProjectName" placeholder="请输入商用项目名称" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -74,6 +79,11 @@
             <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
           </el-form-item>
         </el-col>
+         <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="行业类别" prop="refTradeCategory">
+            <el-input v-model="mainForm.refTradeCategory" placeholder="请输入文件编号" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
@@ -187,10 +197,15 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="enginName" label="项目类别">
-              <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+            <el-form-item prop="enginName" label="家用项目类别">
+              <el-input v-model="screenForm.enginName" placeholder="请输入家用项目类别"></el-input>
             </el-form-item>
           </el-col>
+           <!-- <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="商用项项目名称" prop="refProjectName">
+            <el-input v-model="screenForm.refProjectName" placeholder="请输入家用项目类别" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col> -->
           <el-col :xs="12" :sm="12" :lg="6">
             <el-form-item prop="model" label="规格型号">
               <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
@@ -241,7 +256,11 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+                  <!-- <el-table-column align="center" label="表头登录类型" prop="refPromiseStatus" min-width="200" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="项目类别" prop="refProjectCategory" min-width="200" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="行业类别" prop="refTradeCategory" min-width="200" show-overflow-tooltip></el-table-column> -->
+
+        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -343,6 +362,8 @@ export default {
         createMan: '',
         createDate: '',
         examineRemark: '',
+        refProjectName:"",
+        refTradeCategory:''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -360,6 +381,7 @@ export default {
         date: '',
         warehouse: '',
         type: '',
+        refProjectName:""
       },
       currentPage: 1,
       listTotal: 0,
@@ -382,6 +404,10 @@ export default {
         openSidebar: this.sidebar.opened
       }
     },
+    isDealer() {
+
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
   },
 
   created() {
@@ -430,7 +456,6 @@ export default {
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.loginNum = data.refEnginRecordNo;
-        this.mainForm.enginName = data.refProjectName;
         this.mainForm.loginType = data.enginOrderType;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
@@ -444,7 +469,11 @@ export default {
         this.mainForm.remark = data.remark;
         this.mainForm.examineRemark = data.approvalRemark;
         this.mainForm.fileNo = data.fileNo
+        this.mainForm.refProjectName = data.refProjectName
+         this.mainForm.enginName = data.refProjectCategory;
+         this.mainForm.refTradeCategory = data.refTradeCategory
         this.screenForm.warehouse = data.correspondId;
+        // this.screenForm.refProjectName = data.refProjectName
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,
           name: data.fileName,
@@ -523,6 +552,7 @@ export default {
         pageSize: 10,
         refEnginRecordNo: this.screenForm.loginNum,
         refProjectName: this.screenForm.enginName,
+        // refProjectCategory:this.screenForm.enginName,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
@@ -644,7 +674,8 @@ export default {
       getEnginGoodsDetail({enginOrderNo}).then(res => {
         let data = res.data;
         this.mainForm.loginNum = data.refEnginRecordNo;
-        this.mainForm.enginName = data.refProjectName;
+        this.mainForm.enginName = data.refProjectCategory;
+        this.mainForm.refProjectName = data.refProjectName
         this.mainForm.loginType = data.refPromiseStatus;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
@@ -655,6 +686,9 @@ export default {
         this.mainForm.address = data.refInstallAddress;
         this.mainForm.remark = data.remark;
         this.mainForm.fileNo = data.fileNo
+        this.mainForm.refTradeCategory = data.refTradeCategory
+
+
       })
     },
 
@@ -689,7 +723,9 @@ export default {
             // orderTime: this.mainForm.orderDate + ' 00:00:00',
             remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
-            refProjectName: this.mainForm.enginName,
+            refProjectName: this.mainForm.refProjectName,
+            refTradeCategory:this.mainForm.refTradeCategory,
+            refProjectCategory:this.mainForm.enginName,
             enginOrderType: this.mainForm.loginType,
             refFactoryNo: this.mainForm.factoryNum,
             refUseUnit: this.mainForm.company,

src/views/supply/deliver/components/sum_print.vue

@@ -103,12 +103,21 @@ export default {
 
     // 添加次数
     addPrint() {
-      const ids = this.listItem.map(item => {
-        return item.invoiceOrderId
+      const ids = this.detailArr.map(item => {
+            if (item.invoicePickBeans && item.invoicePickBeans.length) {
+              for (let index = 0; index < item.invoicePickBeans.length; index++) {
+                  const element = item.invoicePickBeans[index];
+                return  item.invoiceOrderId || element.invoiceOrderId || element.id
+              }
+            }else{
+                return item.invoiceOrderId || item.id
+            }
+
       })
+        console.log(ids,'kkk');
       addPrint({ ids: ids.join(',') }).then(res => {
         // this.$successMsg('提交成功');
-        this.$parent.getList()
+         this.$parent.getList()
       })
     }
   }
@@ -123,12 +132,29 @@ export default {
 
 <style scoped lang="scss">
 
+@media print {
+  @page {
+
+    size: A4;
+
+}
+    .detail-container {
+    width: 100%;
+    height: auto !important;
+    margin-bottom: 50px;
+    font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+    color: #000 !important;
+  }
+  .top-container {
+    margin: 20px;
+  }
+
+  }
+
   .detail-container {
     width: 100%;
     height: auto !important;
     margin-bottom: 50px;
-    font-family:'STKaiti','KaiTi','Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif !important;
-    font-weight: bold !important;
     color: #000 !important;
   }
   .top-container {

src/views/supply/deliver/sum_list.vue

@@ -126,6 +126,7 @@
             show-summary
             :summary-method="$getSummaries">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
+
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="发货单号" prop="id" min-width="130" show-overflow-tooltip>
@@ -134,6 +135,12 @@
                 <span>{{scope.row.id}}</span>
               </template>
             </el-table-column>
+               <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.orderId" />
+                <span>{{scope.row.orderId}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
@@ -215,7 +222,10 @@
             <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
-          </el-table>
+                   <el-table-column align="left" label="打印次数" prop="printNum" min-width="200" show-overflow-tooltip></el-table-column>
+
+
+        </el-table>
         </div>
       </div>
       <div class="pagination clearfix">

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

@@ -46,7 +46,7 @@
             </el-col>
              <el-col :span="8" class="item">
               <div class="label">工程编号</div>
-              <div class="value">{{detailData.enginNum}}</div>
+              <div class="value">{{detailData.refProjectNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">跨区厂编号</div>
@@ -536,6 +536,8 @@ export default {
         item.position2 = '';
         item.status1 = '';
         item.status2 = '';
+        this.$set(item,'realDirectTransferQty',item.refundableQty)
+
       })
       this.getPositionList();
     },

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

@@ -496,7 +496,7 @@ export default {
         if(this.isFirst) {
           this.isFirst = false;
         }else {
-          this.mainForm.salesMan = this.goodsList[0].serviceId;
+          // this.mainForm.salesMan = this.goodsList[0].serviceId;
         }
       }
       return list
@@ -504,21 +504,21 @@ export default {
   },
 
   watch: {
-    // goodsList: {
-    //   handler(newValue, oldValue) {
-    //     if(this.goodsList && this.goodsList.length) {
-    //       if(this.isFirst) {
-    //         this.isFirst = false;
-    //       }else {
-    //         this.mainForm.salesMan = this.goodsList[0].serviceId;
-    //       }
-    //     }else {
-    //       this.mainForm.salesMan = '';
-    //     }
-    //   },
-    //   immediate: true,
-    //   deep: true
-    // }
+    goodsList: {
+      handler(newValue, oldValue) {
+        if(this.goodsList && this.goodsList.length) {
+          if(this.isFirst) {
+            this.isFirst = false;
+          }else {
+            // this.mainForm.salesMan = this.goodsList[0].serviceId;
+          }
+        }else {
+          this.mainForm.salesMan = '';
+        }
+      },
+      immediate: true,
+      deep: true
+    }
   },
 
   beforeCreate() {

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

@@ -48,6 +48,7 @@
               <div class="label">跨区厂编号</div>
               <div class="value">{{detailData.refFactoryNo}}</div>
             </el-col>
+
             <el-col :span="8" class="item">
               <div class="label">使用单位</div>
               <div class="value">{{detailData.refUseUnit}}</div>
@@ -264,7 +265,7 @@
           <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.realDirectTransferQty" size="small" type="number"></el-input>
+              <el-input v-model="scope.row.realDirectTransferQty " size="small" type="number"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
@@ -528,6 +529,8 @@ export default {
         item.position2 = '';
         item.status1 = '';
         item.status2 = '';
+        this.$set(item,'realDirectTransferQty',item.refundableQty)
+
       })
       this.getPositionList();
     },

src/views/supply/engin/engin_list.vue

@@ -185,7 +185,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
-             <el-table-column align="left" label="业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+             <!-- <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column> -->
             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/pickup/check.vue

@@ -231,7 +231,7 @@ import {
   getPickupManInfo,
   checkPassword,
 } from "@/api/supply/pickup";
-import { getDealerList } from "@/api/basic_data/dealer";
+import { getDealerList, getListCustomer } from "@/api/basic_data/dealer";
 
 import PickupPrint from "@/views/supply/pickup/components/pickup_print";
 
@@ -292,7 +292,7 @@ dealerList:[],
   },
 
   created() {
-    this.getDealerList()
+    // this.getDealerList()
   },
 
   methods: {
@@ -341,9 +341,21 @@ dealerList:[],
         this.screenForm.name = res.data.takerName;
         this.screenForm.idCard = res.data.identity;
         this.screenForm.manId = res.data.id;
+        this.getListCustomer()
       });
     },
-
+    getListCustomer(){
+    getListCustomer({
+          keyword:'',
+          phone: this.screenForm.phone,
+          pageNum:1,
+          pageSize:-1
+        }).then(res=>{
+          this.dealerList = res.data.records
+          this.screenForm.customerNumber = this.dataList[0].number
+        })
+
+},
     // 查询列表
     getList() {
       if (!this.screenForm.manId) {

src/views/supply/pickup/components/pickup_form.vue

@@ -3,7 +3,7 @@
 
     <el-page-header @back="goBack" :content="listItem ? '编辑':'新增'"></el-page-header>
     <el-divider></el-divider>
-    
+
     <div>
       <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="80px" size="small" label-position="left">
         <el-row :gutter="20">
@@ -97,7 +97,7 @@
           </el-table-column>
           <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" 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="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
@@ -321,7 +321,7 @@ export default {
               this.submitForm();
             }
           })
-          
+
         }
       })
     },

src/views/supply/pickup/pickup_list.vue

@@ -33,7 +33,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -136,11 +136,11 @@
             <el-table-column align="center" label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles)">编辑</el-button>
-                <el-popconfirm 
-                  style="margin-left: 10px;" 
-                  :title="'确定' + (scope.row.printNum ? '作废' : '取消') +'吗？'" 
-                  @onConfirm="handleCancel(scope.row.id)" 
-                  v-if="$checkBtnRole('del', $route.meta.roles)" >
+                <el-popconfirm
+                  style="margin-left: 10px;"
+                  :title="'确定' + (scope.row.printNum ? '作废' : '取消') +'吗？'"
+                  @onConfirm="handleCancel(scope.row.id)"
+                  v-if="$checkBtnRole('refund', $route.meta.roles)" >
                   <el-button slot="reference" type="text">{{scope.row.printNum ? '作废' : '取消'}}</el-button>
                 </el-popconfirm>
               </template>

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

@@ -551,10 +551,11 @@
           <el-table-column
             align="right"
             label="订单数量"
-            prop="refundableQty"
+            prop="qty"
             min-width="100"
             show-overflow-tooltip
           />
+          <!-- refundableQty -->
           <el-table-column
             align="right"
             label="发货数量"
@@ -836,7 +837,18 @@ export default {
     // 打开 直调发货
     openDeliverDialog() {
       this.isShowDeliverDialog = true
+          this.detailData.retailOrderItemList.forEach(item => {
+            if(item.isDirectTransfer){
+
+               this.$set(item,'adjustNum',item.refundableQty)
+            }else{
+
+              this.$set(item,'adjustNum',0)
+
+            }
+      })
       this.goodsList = this.detailData.retailOrderItemList
+
       this.getPositionList()
     },
     // 获取虚拟仓位列表

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

@@ -17,7 +17,7 @@
       label-position="right"
     >
       <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :lg="8">
+        <el-col :xs="24" :sm="12" :lg="12">
           <el-form-item label="销售政策编号" prop="policyCode">
             <div style="display: flex">
               <el-input
@@ -43,7 +43,7 @@
           </el-form-item>
 
         </el-col> -->
-        <el-col :xs="24" :sm="12" :lg="8" style="height: 51px">
+        <el-col :xs="24" :sm="12" :lg="12" style="height: 51px">
           <el-form-item label="单据日期" prop="date">
             <el-date-picker
               v-model="mainForm.date"
@@ -55,15 +55,15 @@
           </el-form-item>
         </el-col>
 
-        <el-col :xs="24" :sm="8" :lg="8">
-          <el-form-item label="备注" prop="remark">
+        <el-col :xs="24" :sm="12" :lg="12">
+          <el-form-item label="表头备注" prop="remark">
             <el-input
               v-model="mainForm.remark"
-              placeholder="请输入备注"
+              placeholder="请输入表头备注"
             />
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
+        <el-col :xs="24" :sm="12" :lg="12">
           <el-form-item label="业务员" prop="k3ServiceName">
             <el-select
               v-model="mainForm.k3ServiceName"
@@ -358,7 +358,7 @@
         </el-table-column> -->
         <el-table-column
           align="left"
-          label="备注"
+          label="表头备注"
           prop="remark"
           min-width="160"
         >

src/views/supply/policy/policy_list.vue

@@ -99,8 +99,20 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+              <el-form-item label="表头业务员" prop="k3ServiceId">
+                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" size="small" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="serviceId">
+                <el-select v-model="screenForm.serviceId" placeholder="选择表体业务员" size="small" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
@@ -218,6 +230,13 @@
                 </div>
               </template>
             </el-table-column>
+               <el-table-column
+              align="left"
+              label="销售类型"
+              prop="saleTypeName"
+              min-width="200"
+              show-overflow-tooltip
+            />
             <el-table-column
               align="left"
               label="销售政策编号"
@@ -620,7 +639,9 @@ export default {
         status: '',
         salesMan:'',
         isDirectTransfer:null,
-        specification:''
+        specification:'',
+        k3ServiceId:'',
+        serviceId:''
       },
       transfer:[
         {label:'是',value:true},
@@ -746,7 +767,8 @@ export default {
         createBy: this.screenForm.zbMan,
         status: true,
         examineBy: this.screenForm.shMan,
-        serviceId:this.screenForm.salesMan,
+        k3ServiceId:this.screenForm.k3ServiceId,
+        serviceId:this.screenForm.serviceId,
         isDirectTransfer: this.screenForm.isDirectTransfer,
         specification:this.screenForm.specification,
         type: 2 // 1:普通零售单，2:政策零售单

src/views/supply/reserve/components/reserve_form.vue

@@ -75,7 +75,31 @@
               filterable
               remote
               clearable
-              :remote-method="checkDealerList"
+              :remote-method="(e)=>checkDealerList(e,1)"
+              @change="changeDealer(scope.$index)">
+              <el-option
+                v-for="item in dealerList"
+                :key="item.number"
+                :label="item.number"
+                :value="item.number">
+                <span>{{ item.number }}</span>
+                <span style="color: #8492a6; font-size: 13px; margin-left: 6px">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+             <template slot-scope="scope">
+            <div v-if="scope.row.orderId || listItem">{{scope.row.customerName}}</div>
+            <el-select
+              v-else
+              v-model="scope.row.customerName"
+              placeholder="选择经销商"
+              size="small"
+              filterable
+              remote
+              clearable
+              :remote-method="(e)=>checkDealerList(e,2)"
               @change="changeDealer(scope.$index)">
               <el-option
                 v-for="item in dealerList"
@@ -88,7 +112,6 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料编码" prop="materialCode" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <div v-if="scope.row.orderId || listItem">{{scope.row.materialCode}}</div>
@@ -100,7 +123,7 @@
               filterable
               remote
               clearable
-              :remote-method="checkMaterialList"
+                :remote-method="(e)=>checkMaterialList(e,1)"
               @change="changeMaterial(scope.$index)">
               <el-option
                 v-for="item in materialList"
@@ -115,7 +138,30 @@
         </el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="规格型号" prop="specification" min-width="200" show-overflow-tooltip>
+           <template slot-scope="scope">
+            <div v-if="scope.row.orderId || listItem">{{scope.row.specification}}</div>
+            <el-select
+              v-else
+              v-model="scope.row.specification"
+              placeholder="选择规格型号"
+              size="small"
+              filterable
+              remote
+              clearable
+              :remote-method="(e)=>checkMaterialList(e,2)"
+              @change="changeDealer(scope.$index)">
+              <el-option
+                v-for="item in dealerList"
+                :key="item.number"
+                :label="item.number"
+                :value="item.number">
+                <span>{{ item.number }}</span>
+                <span style="color: #8492a6; font-size: 13px; margin-left: 6px">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </template>
+        </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="oldNum" min-width="100" show-overflow-tooltip></el-table-column> -->
         <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip>
@@ -548,9 +594,12 @@ export default {
     },
 
     // 查询经销商列表
-    checkDealerList(query) {
+    checkDealerList(query,type) {
+
       checkDealerList({
-        number: query,
+        number:type==1 ? query :'',
+        name:type ==2 ? query :'',
+
       }).then(res => {
         this.dealerList = res.data || [];
       })
@@ -569,9 +618,10 @@ export default {
     },
 
     // 查询产品
-    checkMaterialList(query) {
+    checkMaterialList(query,type) {
       checkMaterialList({
-        number: query,
+        number: type ==1 ?query:'',
+         specification:type ==2 ?query:''
       }).then(res => {
         this.materialList = res.data || [];
       })

src/views/supply/retail/components/retail_detail.vue

@@ -453,7 +453,18 @@ export default {
     // 打开 直调发货
     openDeliverDialog() {
       this.isShowDeliverDialog = true;
+        this.detailData.retailOrderItemList.forEach(item => {
+            if(item.isDirectTransfer){
+
+               this.$set(item,'adjustNum',item.refundableQty || item.qty)
+            }else{
+
+              this.$set(item,'adjustNum',0)
+
+            }
+      })
       this.goodsList = this.detailData.retailOrderItemList;
+
       this.getPositionList();
     },