Merge branch 'bug' into 11_3_week

src/components/Common/image-upload.vue

@@ -5,6 +5,7 @@
       :action="oss_url"
       :data="dataObj"
       :multiple="multiple"
+      :limit="limit"
       name="file"
       :accept="accept"
       :show-file-list="false"
@@ -38,7 +39,7 @@
           </div>
         </div>
       </div>
-      <div v-if="multiple || (!multiple && fileList.length < 1)" class="add" @click="uploadImage()">
+      <div v-if="multiple|| (!multiple && fileList.length < 1) " class="add" @click="uploadImage()">
         <i class="el-icon-plus" />
       </div>
     </div>
@@ -51,6 +52,8 @@ import { findElem } from '@/utils/util'
 export default {
   name: 'FileUpload',
   props: {
+    // 最大上传数量
+    limit:Number,
     // 接受上传的文件列表
     fileList: Array,
 

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

@@ -99,7 +99,7 @@
           <div class="value">{{ detailList.customerName }}</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.refDeclareNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">

src/views/deposit_commerce/refund_list.vue

@@ -292,7 +292,7 @@
           >
             >
             <el-table-column type="selection" align="center" width="55"> </el-table-column>
-            <el-table-column align="left" label="状态" prop="" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="状态" prop="" min-width="60" show-overflow-tooltip>
               <template v-slot="{ row }">
                 <el-tag size="mini" v-show="row.examineStatus == 'SAVE'">保存</el-tag>
                 <el-tag size="mini" v-show="row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
@@ -300,8 +300,8 @@
                 <el-tag size="mini" v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="right" label="金额" prop="hasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="数量" prop="hasSendQty" min-width="60" show-overflow-tooltip />
+            <el-table-column align="right" label="金额" prop="hasSendQty" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="工程登录编号"
@@ -328,7 +328,7 @@
               align="left"
               label="经销商编码"
               prop="customerNumber"
-              min-width="160"
+              min-width="100"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -342,15 +342,15 @@
                 <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="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refFactoryNo" />
                 <span>{{ scope.row.refFactoryNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="120" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="120" show-overflow-tooltip>
             </el-table-column>
             <el-table-column
               align="left"
@@ -369,7 +369,7 @@
               label="使用单位
 "
               prop="refUseUnit"
-              min-width="160"
+              min-width="250"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -378,7 +378,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refRegionWork" />
                 <span>{{ scope.row.refRegionWork }}</span>
@@ -396,7 +396,7 @@
                 <span>{{ scope.row.geLiInerNote }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />
                 <span>{{ scope.row.materialNumber }}</span>
@@ -406,7 +406,7 @@
               align="left"
               label="产品编码"
               prop="materialOldNumber"
-              min-width="260"
+              min-width="150"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -415,13 +415,13 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
                 <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
@@ -431,7 +431,7 @@
               align="right"
               label="押金金额"
               prop="itemDepositAmount"
-              min-width="160"
+              min-width="100"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -442,25 +442,25 @@
             </el-table-column> -->
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="审核人" prop="confirmName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="审核人" prop="confirmName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.confirmName" />
                 <span>{{ scope.row.confirmName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="金额" prop="totalPrice" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="金额" prop="totalPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.totalPrice | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="80" show-overflow-tooltip />
             <!-- <el-table-column align="right" label="合同单价" prop="contractPrice" min-width="160" show-overflow-tooltip >
                 <template slot-scope="scope">
                   {{ scope.row.contractPrice | numToFixed}}
                 </template>
               </el-table-column> -->
 
-            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="80" show-overflow-tooltip />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed}}

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

@@ -100,7 +100,7 @@
           <div class="value">{{ detailList.customerName }}</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.refDeclareNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">

src/views/deposit_home/refund_list.vue

@@ -300,22 +300,22 @@
             fit
             highlight-current-row
             stripe
+            @selection-change="handleSelectionChange"
             show-summary
             :summary-method="$getSummaries"
-            @selection-change="handleSelectionChange"
           >
             >
-            <el-table-column type="selection" align="center" width="55" />
-            <el-table-column align="left" label="状态" prop="" min-width="160" show-overflow-tooltip>
+            <el-table-column type="selection" align="center" width="55"> </el-table-column>
+            <el-table-column align="left" label="状态" prop="" min-width="60" show-overflow-tooltip>
               <template v-slot="{ row }">
-                <el-tag v-show="row.examineStatus == 'SAVE'" size="mini">保存</el-tag>
-                <el-tag v-show="row.examineStatus == 'WAIT'" size="mini" type="warning">待审核</el-tag>
-                <el-tag v-show="row.examineStatus == 'OK'" size="mini" type="success">通过</el-tag>
-                <el-tag v-show="row.examineStatus == 'FAIL'" size="mini" type="danger">不通过</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'SAVE'">保存</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'OK'" type="success">通过</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
               </template>
             </el-table-column>
-            <!--            <el-table-column align="right" label="数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />-->
-            <!--            <el-table-column align="right" label="金额" prop="hasSendQty" min-width="160" show-overflow-tooltip />-->
+            <el-table-column align="right" label="数量" prop="hasSendQty" min-width="60" show-overflow-tooltip />
+            <el-table-column align="right" label="金额" prop="hasSendQty" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="工程登录编号"
@@ -324,7 +324,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <span>{{ scope.row.refEnginRecordNo }}</span>
               </template>
             </el-table-column>
@@ -342,28 +342,30 @@
               align="left"
               label="经销商编码"
               prop="customerNumber"
-              min-width="160"
+              min-width="100"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.customerNumber" />
+                <CopyButton :copyText="scope.row.customerNumber" />
                 <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.customerName" />
+                <CopyButton :copyText="scope.row.customerName" />
                 <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="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.refFactoryNo" />
+                <CopyButton :copyText="scope.row.refFactoryNo" />
                 <span>{{ scope.row.refFactoryNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip />
-            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="120" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="120" show-overflow-tooltip>
+            </el-table-column>
             <el-table-column
               align="left"
               label="行业类别"
@@ -372,23 +374,31 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.refTradeCategory" />
+                <CopyButton :copyText="scope.row.refTradeCategory" />
                 <span>{{ scope.row.refTradeCategory }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="使用单位
+"
+              prop="refUseUnit"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.refUseUnit" />
+                <CopyButton :copyText="scope.row.refUseUnit" />
                 <span>{{ scope.row.refUseUnit }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
+
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.refRegionWork" />
+                <CopyButton :copyText="scope.row.refRegionWork" />
                 <span>{{ scope.row.refRegionWork }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column
+            <el-table-column
               v-if="!isCustomer"
               align="left"
               label="格力内部备注"
@@ -399,10 +409,10 @@
               <template slot-scope="scope">
                 <span>{{ scope.row.geLiInerNote }}</span>
               </template>
-            </el-table-column> -->
-            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.materialNumber" />
+                <CopyButton :copyText="scope.row.materialNumber" />
                 <span>{{ scope.row.materialNumber }}</span>
               </template>
             </el-table-column>
@@ -410,77 +420,32 @@
               align="left"
               label="产品编码"
               prop="materialOldNumber"
-              min-width="260"
+              min-width="150"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.materialOldNumber" />
+                <CopyButton :copyText="scope.row.materialOldNumber" />
                 <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.materialName" />
+                <CopyButton :copyText="scope.row.materialName" />
                 <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="300" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.specification" />
+                <CopyButton :copyText="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
-              align="left"
-              label="实装规格型号"
-              prop="realSpecification"
-              min-width="300"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <div :style="scope.row.realSpecification != scope.row.specification ? { color: 'blue' } : ''">
-                  {{ scope.row.realSpecification }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="left"
-              label="实装物料编号"
-              prop="realMaterialNumber"
-              min-width="150"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <div :style="scope.row.realMaterialNumber != scope.row.materialNumber ? { color: 'blue' } : ''">
-                  {{ scope.row.realMaterialNumber }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="left"
-              label="实装厂产品编码"
-              prop="realMaterialOldNumber"
-              min-width="200"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } : ''">
-                  {{ scope.row.realMaterialOldNumber }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="是否退押" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.isRefundDeposit" type="success" size="small">是</el-tag>
-                <el-tag v-else type="warning" size="small">否</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column
               align="right"
               label="押金金额"
               prop="itemDepositAmount"
-              min-width="160"
+              min-width="100"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -489,102 +454,54 @@
             </el-table-column>
             <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column> -->
-
-            <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="审核人" prop="confirmName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="left" label="审核人" prop="confirmName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.confirmName" />
+                <CopyButton :copyText="scope.row.confirmName" />
                 <span>{{ scope.row.confirmName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="金额" prop="totalPrice" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="金额" prop="totalPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.totalPrice | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="80" show-overflow-tooltip />
+            <!-- <el-table-column align="right" label="合同单价" prop="contractPrice" min-width="160" show-overflow-tooltip >
+                <template slot-scope="scope">
+                  {{ scope.row.contractPrice | numToFixed}}
+                </template>
+              </el-table-column> -->
 
-            <!-- <el-table-column
-              align="right"
-              label="合同数量"
-              prop="itemContractQty"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.itemContractQty || 0}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="right"
-              label="合同单价"
-              prop="itemContractPrice"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.itemContractPrice | numToFixed }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="right"
-              label="合同金额"
-              prop="itemContractAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.itemContractAmount | numToFixed }}
-              </template>
-            </el-table-column> -->
-            <el-table-column
-              align="right"
-              label="发货数量"
-              prop="orderHasSendQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="80" show-overflow-tooltip />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed}}
               </template>
             </el-table-column> -->
-
-            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />
+            <!--            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />-->
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button
-                  v-if="scope.row.examineStatus == 'WAIT' && $checkBtnRole('examine', $route.meta.roles)"
                   type="text"
                   class="textColor"
+                  v-if="scope.row.examineStatus == 'WAIT' && $checkBtnRole('examine', $route.meta.roles)"
                   @click="examineFn(scope.row.depositManageId)"
-                >审批
-                </el-button>
+                >审批</el-button
+                >
 
                 <el-button
+                  type="text"
+                  class="textColor"
                   v-if="
                     scope.row.examineStatus == 'SAVE' ||
-                      scope.row.examineStatus == 'OK' ||
-                      scope.row.examineStatus == 'FAIL'
+                    scope.row.examineStatus == 'OK' ||
+                    scope.row.examineStatus == 'FAIL'
                   "
-                  type="text"
-                  class="textColor"
                   @click="infoFn(scope.row.depositManageId)"
-                >详情
-                </el-button>
-                <el-popconfirm
-                  v-if="scope.row.examineStatus == 'OK' && !scope.row.isRefundDeposit && scope.row.takeDeposit!==true"
-                  style="margin-left: 10px"
-                  title="二次退押吗？"
-                  @onConfirm="secondRefund(scope.row)"
+                >详情</el-button
                 >
-                  <el-button
-                    slot="reference"
-                    type="text"
-                    size="mini"
-                  >二次退押
-                  </el-button>
-                </el-popconfirm>
               </template>
             </el-table-column>
           </el-table>

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

@@ -97,7 +97,7 @@
           <div class="value">{{ detailList.customerName }}</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.refDeclareNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">

src/views/finance/rebate_list.vue

@@ -69,6 +69,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6" >
+                  <el-form-item label="制单人" prop="createBy">
+                    <el-input v-model="searchForm.createBy" placeholder="请输入制单人"></el-input>
+                  </el-form-item>
+                </el-col><el-col :xs="24" :sm="12" :lg="6" >
+                <el-form-item label="审核人" prop="examineBy">
+                  <el-input v-model="searchForm.examineBy" placeholder="请输入审核人"></el-input>
+                </el-form-item>
+              </el-col>
+                <el-col :xs="24" :sm="12" :lg="6" >
                   <el-form-item label="备注1" prop="remark1">
                     <el-input v-model="searchForm.remark1" placeholder="请输入备注1"></el-input>
                   </el-form-item>
@@ -622,7 +631,9 @@ export default {
         endTime: '',
         examineStatus: '',
         isConfirm: '',
-        remark1:''
+        remark1:'',
+        examineBy:'',
+        createBy:''
       }, //搜索表单
       listLoading: false, // 列表加载loading
       showPage: 1,
@@ -769,6 +780,8 @@ export default {
         customerNumber: this.searchForm.customerNumber,
         endTime: this.searchForm.endTime,
         remark1: this.searchForm.remark1,
+        examineBy:this.searchForm.examineBy,
+        createBy:this.searchForm.createBy,
         examineStatus: this.searchForm.examineStatus,
         id: this.searchForm.id,
         isConfirm: this.searchForm.isConfirm,

src/views/sales_policy/components/AddPolicy.vue

@@ -84,7 +84,7 @@
               </el-col>
               <el-col :xs="24" :ms="24" :lg="24">
                 <el-form-item label="政策封面图">
-                  <ImageUpload :file-list="fileList" :multiple="false" />
+                  <ImageUpload :file-list="fileList" multiple :limit="3"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -193,6 +193,9 @@
                   v-model="scope.row.saleTypeId"
                   size="mini"
                   filterable
+                  remote
+                  reserve-keyword
+                  :remote-method="query => remoteMethodType(query, 'saleTypeId')"
                   @change="handleSalesType($event, scope.row, scope.$index, 'saleTypeId')"
                 >
                   <el-option v-for="item in typeList" :key="item.id" :label="item.saleName" :value="item.id" />
@@ -627,6 +630,19 @@ export default {
         this.k3List = [...this.k3List, ...res.data.records]
       })
     },
+    async remoteMethodType(query, type){
+      console.log(111)
+      // 获取销售类型列表
+      const params = {
+        pageNum: 1,
+        pageSize:-1,
+        saleCode:query,
+        saleName: '',
+        status: ''
+      }
+      const typeData = await getTypeList(params)
+      this.typeList = typeData.data.records
+    },
     remoteMethod(query, type) {
       console.log(query, type)
       if (query !== '') {
@@ -674,6 +690,7 @@ export default {
       this.typeList = typeData.data.records
     },
     handleSalesType(e, row, index, name) {
+      console.log(e)
       const item = this.typeList.filter(k => {
         return k.id === e
       })[0]
@@ -857,6 +874,10 @@ export default {
         //     this.searchForm.mainName = k.dictValue;
         //   }
         // });
+        let imgUrl = []
+        this.fileList.forEach(k=>{
+              imgUrl.push(k.url)
+        })
         const params = {
           adminCompanyId: '',
           code: '',
@@ -873,7 +894,7 @@ export default {
           ...this.searchForm,
           flag: region,
           endTime: this.searchForm.endTime || '2100-01-01 00:00:00',
-          imgSrc: this.fileList.length ? this.fileList[0].url : ''
+          imgSrc: imgUrl.join(',')
         }
         console.log(this.fileList)
         addPoliy(params).then(res => {

src/views/sales_policy/components/Examine.vue

@@ -91,8 +91,9 @@
               <div class="label" style="height: 150px">政策封面图</div>
               <div class="value" style="height: 150px">
                 <el-image
-                  style="height: 120px; widht: 120px"
-                  :src="$imageUrl + detail.imgSrc"
+                  v-for="item in detail.imgSrc"
+                  style="height: 120px; widht: 120px;margin-left: 10px"
+                  :src="$imageUrl + item"
                   fit="fill"
                   :preview-src-list="srcList"
                 />
@@ -751,7 +752,10 @@ export default {
       this.listLoading = true
       getPolicyDetail({ policyId: this.$parent.id }).then(res => {
         this.detail = res.data
-        this.srcList = [this.$imageUrl + this.detail.imgSrc]
+          this.detail.imgSrc = this.detail.imgSrc.split(',')
+        this.detail.imgSrc.forEach(k=>{
+          this.srcList.push(this.$imageUrl+k)
+        })
         if (this.$parent.isShow == 5 && this.detail.imgSrc) {
           this.fileList = [
             {

src/views/sales_policy/components/TabelTransfer.vue

@@ -64,6 +64,7 @@
               ><template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.name" />
                 <span>{{ scope.row.name }}</span>
+                <span class="red">{{scope.row.number}}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -113,6 +114,7 @@
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.customerName" />
                 <span>{{ scope.row.customerName }}</span>
+                <span class="red">{{scope.row.customerNumber}}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -745,4 +747,8 @@ export default {
   display: flex;
   align-items: center;
 }
+.red{
+
+  color: #f00;
+}
 </style>

src/views/sales_policy/components/details.vue

@@ -84,8 +84,10 @@
               <div class="label" style="height: 150px">政策封面图</div>
               <div class="value" style="height: 150px">
                 <el-image
-                  style="height: 120px; widht: 120px"
-                  :src="$imageUrl + detail.imgSrc"
+
+                  v-for="item in detail.imgSrc"
+                  style="height: 120px; widht: 120px;margin-left: 20px"
+                  :src="$imageUrl + item"
                   fit="fill"
                   :preview-src-list="srcList"
                 />
@@ -791,7 +793,11 @@ export default {
       getPolicyDetail({ policyId: this.$parent.id }).then(res => {
         this.detail = res.data
         this.detail.flag = this.detail.flag + ''
-        this.srcList = [this.$imageUrl + this.detail.imgSrc]
+        this.detail.imgSrc = this.detail.imgSrc.split(',')
+        this.detail.imgSrc.forEach(k=>{
+          this.srcList.push(this.$imageUrl+k)
+        })
+        // this.srcList = [this.$imageUrl + this.detail.imgSrc]
         if (this.$parent.isShow == 5 && this.detail.imgSrc) {
           this.fileList = [
             {

src/views/sales_policy/components/editPolicy.vue

@@ -87,7 +87,7 @@
               </el-col>
               <el-col :xs="24" :ms="24" :lg="24">
                 <el-form-item label="政策封面图">
-                  <ImageUpload :file-list="fileList" :multiple="false" />
+                  <ImageUpload :file-list="fileList" multiple :limit="3"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -194,6 +194,9 @@
                   <el-select
                     v-else
                     v-model="scope.row.saleTypeId"
+                    remote
+                    reserve-keyword
+                    :remote-method="query => remoteMethodType(query, 'saleTypeId')"
                     size="mini"
                     filterable
                     @change="handleSalesType($event, scope.row, scope.$index, 'saleTypeId')"
@@ -571,8 +574,8 @@ export default {
       cid: '',
       cpolicyId: '',
       region: 0,
-      fullscreenLoading:false
-
+      fullscreenLoading:false,
+      srcList:[]
     }
   },
   computed: {
@@ -645,6 +648,19 @@ export default {
         this.k3List = [...this.k3List, ...res.data.records]
       })
     },
+    async remoteMethodType(query, type){
+      console.log(111)
+      // 获取销售类型列表
+      const params = {
+        pageNum: 1,
+        pageSize:-1,
+        saleCode:query,
+        saleName: '',
+        status: ''
+      }
+      const typeData = await getTypeList(params)
+      this.typeList = typeData.data.records
+    },
     remoteMethod(query, type) {
       console.log(query, type)
       if (query !== '') {
@@ -790,14 +806,17 @@ export default {
           commercialType: this.detail.commercialType
         }),
           (this.region = res.data.flag)
-        this.srcList = [this.$imageUrl + this.detail.imgSrc]
+
+        // this.srcList = [this.$imageUrl + this.detail.imgSrc]
         if (this.$parent.isShow === 5 && this.detail.imgSrc) {
-          this.fileList = [
-            {
+          this.detail.imgSrc.split(',').forEach(k=>{
+            this.fileList.push({
               hover: '',
-              url: this.detail.imgSrc
-            }
-          ]
+              url:k
+            })
+            this.srcList.push(this.$imageUrl+k)
+          })
+
         }
         await this.handletwoList()
         // 获取条件政策
@@ -907,13 +926,17 @@ export default {
         //     this.searchForm.mainName = k.dictValue;
         //   }
         // });
+        let imgUrl = []
+        this.fileList.forEach(k=>{
+          imgUrl.push(k.url)
+        })
         const params = {
           ...this.detail,
           ...this.searchForm,
           flag: region,
           endTime: this.searchForm.endTime || '2100-01-01 00:00:00',
           policyCustomers: arr,
-          imgSrc: this.fileList.length ? this.fileList[0].url : ''
+          imgSrc: imgUrl.join(',')
         }
         console.log(this.fileList)
         updatePolicy(params).then(res => {

src/views/setting/account.vue

@@ -67,6 +67,7 @@
         <div class="fr">
           <el-button size="mini" @click="handleDownload" v-if="checkBtnRole('download')">下载导入模板</el-button>
           <ExportButton class="import-btn" :exUrl="'admin/user/user/listExport'" :exParams="exParams" />
+          <ImportButton class="import-btn"  im-text="批量变更仓库和产品分类" :imUrl="'admin/user/batch/update'" @importSuccess="getList" />
 
           <el-upload
             class="import-btn"
@@ -81,8 +82,7 @@
               importLoading ? '导入中...' : '导入'
             }}</el-button>
           </el-upload>
-
-          <!--
+          <!--/admin/user/batch/update
           <el-button size="small" type="primary" @click="handleExport">导出</el-button>
 
           <el-button size="small" type="primary" :loading="importLoading" @click="clickImport">{{ importLoading ? '导入中...' : '导入' }}</el-button>

src/views/supply/deliver/home_list.vue

@@ -241,7 +241,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="第几次申报"
+              label="第几申报"
               prop="refDeclareNo"
               min-width="100"
               show-overflow-tooltip

src/views/supply/deliver/sum_list.vue

@@ -684,6 +684,7 @@
               show-overflow-tooltip
             />
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip />
 
             <el-table-column
               align="left"

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

@@ -71,7 +71,7 @@
               <div class="value">{{ detailData.saleTypeName }}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">第几次申报</div>
+              <div class="label">第几申报</div>
               <div class="value">{{ detailData.refDeclareNo }}</div>
             </el-col>
             <el-col :span="8" class="item">

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

@@ -84,9 +84,9 @@
           </div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">第几次申报</div>
+          <div class="label">第几申报</div>
           <div class="value">
-            <el-input v-model="detailData.refDeclareNo" placeholder="请输入第几次申报" />
+            <el-input v-model="detailData.refDeclareNo" placeholder="请输入第几申报" />
           </div>
         </el-col>
         <el-col :span="8" class="item">

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

@@ -111,8 +111,8 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="第几次申报" prop="declareNo">
-            <el-input v-model="mainForm.declareNo" placeholder="请输入第几次申报" :disabled="isDealer" />
+          <el-form-item label="第几申报" prop="declareNo">
+            <el-input v-model="mainForm.declareNo" placeholder="请输入第几申报" :disabled="isDealer" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">

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

@@ -63,7 +63,7 @@
           <div class="value">{{ detailData.saleTypeName }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">第几次申报</div>
+          <div class="label">第几申报</div>
           <div class="value">{{ detailData.refDeclareNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

src/views/supply/engin/engin_list.vue

@@ -9,7 +9,7 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #left_btn>
-            <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
+            <el-radio-group size="mini" v-model="screenForm.status" @change="getList(),screenForm.examineStatus=''">
               <el-radio-button label="">全部</el-radio-button>
               <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                   item.label
@@ -107,6 +107,20 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否关闭" prop="examineStatus">
+                    <el-select v-model="screenForm.examineStatus" placeholder="是否关闭" style="width: 100%">
+                      <el-option  v-if="screenForm.status != 'OK'"  label="是" value="CLOSE">
+                      </el-option>
+                      <el-option  v-else  label="是" value="OK,CLOSE">
+                      </el-option>
+                      <el-option   label="否" :value="null">
+                      </el-option>
+
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
               </el-row>
             </el-form>
           </template>
@@ -222,7 +236,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="项目类别"
+              label="项目名称"
               sortable
               prop="projectName"
               min-width="160"
@@ -521,7 +535,8 @@ export default {
         salesMan: '',
         model: '',
         orderDate: '',
-        isDirectTransfer: null
+        isDirectTransfer: null,
+        examineStatus:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -556,6 +571,16 @@ export default {
       return JSON.parse(localStorage.getItem('supply_user')).isCustomer
     },
     exParams() {
+      let  status = ''
+      if (this.screenForm.examineStatus){
+        if (this.screenForm.status!='OK'){
+          status += this.screenForm.status+ ',' +this.screenForm.examineStatus
+        }else {
+          status = this.screenForm.examineStatus
+        }
+      }else {
+        status = this.screenForm.status
+      }
       return {
         enginInfoNo: this.screenForm.orderNum,
         projectNo: this.screenForm.enginNum,
@@ -569,7 +594,7 @@ export default {
         useUnit: this.screenForm.company,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
-        examineStatus: this.screenForm.status,
+        examineStatus: status,
         serviceId: this.screenForm.salesMan,
         specification: this.screenForm.model,
         isDirectTransfer: this.screenForm.isDirectTransfer
@@ -626,7 +651,16 @@ export default {
     // 查询列表
     getList() {
       this.listLoading = true
-
+      let  status = ''
+      if (this.screenForm.examineStatus){
+        if (this.screenForm.status!='OK'){
+          status += this.screenForm.status+ ',' +this.screenForm.examineStatus
+        }else {
+          status = this.screenForm.examineStatus
+        }
+      }else {
+        status = this.screenForm.status
+      }
       const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
@@ -642,10 +676,10 @@ export default {
         useUnit: this.screenForm.company,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
-        examineStatus: this.screenForm.status,
+        examineStatus: status,
         serviceId: this.screenForm.salesMan,
         specification: this.screenForm.model,
-        isDirectTransfer: this.screenForm.isDirectTransfer
+        isDirectTransfer: this.screenForm.isDirectTransfer,
       }
       getEnginList(params).then(res => {
         res.data.records.forEach(item => {

src/views/supply/implement/implement_list.vue

@@ -129,6 +129,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否置换过" prop="isDisplaceOrder">
+                    <el-select v-model="screenForm.isDisplaceOrder" clearable placeholder="请选择">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="钱包" prop="walletIds1">
                     <el-select v-model="screenForm.walletIds1" size="mini" multiple filterable>
                       <el-option
@@ -278,6 +287,13 @@
             ></el-table-column>
             <el-table-column
               align="right"
+              label="返利钱包"
+              prop="rebateWalletName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="right"
               label="订单未发货数量"
               prop="refundableQty"
               min-width="120"
@@ -331,6 +347,17 @@
               prop="hasSendQty"
               min-width="100"
               show-overflow-tooltip
+            >
+              <template v-slot="{row}">
+                {{row.qty - (row.refundQty || 0)}}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="出库数量"
+              prop="hasSendQty"
+              min-width="100"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="right"
@@ -514,7 +541,9 @@ export default {
         k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
+
       }
     }
   },
@@ -555,7 +584,9 @@ export default {
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,
-        walletIds1: this.screenForm.walletIds1.join(',')
+        walletIds1: this.screenForm.walletIds1.join(','),
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
+
       }
       getList(params).then(res => {
         res.data.records.forEach(item => {

src/views/supply/implement/implement_total_list.vue

@@ -135,6 +135,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否置换过" prop="isDisplaceOrder">
+                    <el-select v-model="screenForm.isDisplaceOrder" clearable placeholder="请选择">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="钱包" prop="walletIds1">
                     <el-select v-model="screenForm.walletIds1" size="mini" multiple filterable>
                       <el-option
@@ -297,6 +306,13 @@
             ></el-table-column>
             <el-table-column
               align="right"
+              label="返利钱包"
+              prop="rebateWalletName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="right"
               label="订单未发货数量"
               prop="refundableQty"
               min-width="120"
@@ -350,6 +366,17 @@
               prop="hasSendQty"
               min-width="100"
               show-overflow-tooltip
+            >
+              <template v-slot="{row}">
+                {{row.qty - (row.refundQty || 0)}}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="出库数量"
+              prop="hasSendQty"
+              min-width="100"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="right"
@@ -382,6 +409,20 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
+              align="right"
+              label="原供价"
+              prop="orgPrice"
+              min-width="100"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{ scope.row.orgPrice | numToFixed }}
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column
               align="left"
               label="表头业务员"
               prop="serviceName"
@@ -505,7 +546,8 @@ export default {
         policyRemark: '',
         isOver: '',
         orderDate: '',
-        walletIds1: []
+        walletIds1: [],
+        isDisplaceOrder:''
       },
       categoryList: [],
       statusList: [
@@ -542,7 +584,8 @@ export default {
         k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
       }
     }
   },
@@ -583,7 +626,8 @@ export default {
         walletIds1: this.screenForm.walletIds1.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
       }
       getTotalList(params).then(res => {
         res.data.records.forEach(item => {