Finish Hotfix-zh-88

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

@@ -358,7 +358,19 @@
               <el-input
                 v-model="details.applyNote"
                 type="textarea"
-                placeholder="请输入"
+                placeholder="请输入退押说明"
+                class="textareaStyle"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="18"  v-if="isCustomer">
+            <el-form-item label="验收说明
+" prop="checkNote">
+              <el-input
+                v-model="details.checkNote"
+                type="textarea"
+                placeholder="请输入验收说明
+"
                 class="textareaStyle"
               />
             </el-form-item>
@@ -407,6 +419,11 @@ export default {
       ]
     }
   },
+   computed:{
+    isCustomer(){
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
+  },
   created() {
     this.imageURL = this.$imageUrl
     geDetail({ id: this.$parent.depositManageId }).then((res) => {
@@ -430,14 +447,14 @@ export default {
       }
       this.fileList.forEach((el) => {
          console.log(this.details.dataList.length)
-        if (this.details.dataList.length){
-          this.details.dataList.forEach((i,e)=>{
-            console.log(i.fileName==el.name)
-            if (el.name === i.fileName){
-              this.details.dataList.splice(e,1)
-            }
-          })
-        }
+        // if (this.details.dataList.length){
+        //   this.details.dataList.forEach((i,e)=>{
+        //     console.log(i.fileName==el.name)
+        //     if (el.name === i.fileName){
+        //       this.details.dataList.splice(e,1)
+        //     }
+        //   })
+        // }
 
         arr.push({
           dataDescribe: el.name,

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

@@ -752,7 +752,7 @@ export default {
       }
     }
   },
-    component:{
+    computed:{
     isCustomer(){
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     }
@@ -760,6 +760,7 @@ export default {
   created() {
     this.getDetail()
   },
+
   methods: {
     getDetail() {
       if (this.engineering == '工程押金信息') {

src/views/deposit_commerce/deposit_list.vue

@@ -41,7 +41,7 @@
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程名称" prop="refProjectName">
+              <el-form-item label="使用单位" prop="refProjectName">
                 <el-input
                   v-model="screenForm.refProjectName"
                   placeholder="请输入"
@@ -80,7 +80,7 @@
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
+              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
               <el-option  label="默认" :value="null"></el-option>
 
                 <el-option v-for="item in refundDepositArr"
@@ -91,9 +91,9 @@
               </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 v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
+              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
               <el-option  label="默认" :value="null"></el-option>
 
                 <el-option v-for="item in examineStatusArr"
@@ -114,6 +114,58 @@
                 <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="refProjectName">
+                <el-input
+                  v-model="screenForm.refProjectName"
+                  placeholder="请输入机型"
+                />
+              </el-form-item>
+            </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="特价编号" prop="refProjectName">
+                <el-input
+                  v-model="screenForm.refProjectName"
+                  placeholder="请输入特价编号"
+                />
+              </el-form-item>
+            </el-col>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="厂编号" prop="refProjectName">
+                <el-input
+                  v-model="screenForm.refProjectName"
+                  placeholder="请输入厂编号"
+                />
+              </el-form-item>
+            </el-col>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核表" prop="refProjectName">
+                <el-input
+                  v-model="screenForm.refProjectName"
+                  placeholder="请输入审核表"
+                />
+              </el-form-item>
+            </el-col>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refProjectName">
+                <el-input
+                  v-model="screenForm.refProjectName"
+                  placeholder="请输入区域"
+                />
+              </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>
+              </template>
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
                 <el-button
@@ -396,7 +448,11 @@ export default {
         startSubmitTime:'',
         startConfirmTime:'',
         isRefundDeposit:null,
-        examineStatus:null
+        examineStatus:null,
+         installDate:'',
+        specification:'',
+        factoryNo:'',
+        specialNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -439,7 +495,11 @@ export default {
       ]
     }
   },
-
+ computed:{
+    isCustomer(){
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
+  },
   methods: {
     // 免扣申请
     deductionFn() {

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

@@ -363,6 +363,18 @@
               />
             </el-form-item>
           </el-col>
+            <el-col :xs="24" :sm="12" :lg="18"  v-if="isCustomer">
+            <el-form-item label="验收说明
+" prop="checkNote">
+              <el-input
+                v-model="details.checkNote"
+                type="textarea"
+                placeholder="请输入验收说明
+"
+                class="textareaStyle"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :xs="24" :sm="24" :lg="24">
             <el-form-item label="">
               <el-button
@@ -407,6 +419,11 @@ export default {
       ]
     }
   },
+    computed:{
+    isCustomer(){
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
+  },
   created() {
     this.imageURL = this.$imageUrl
     geDetail({ id: this.$parent.depositManageId }).then((res) => {

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

@@ -75,7 +75,7 @@
               <div class="label">工程差价总额</div>
               <div class="value">{{ details.depositDiffAmount }}</div>
             </el-col>
-                 <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="isCustomer">
+                 <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
               <div class="label">格力备注</div>
               <div class="value">{{ details.geLiInerNote }}</div>
             </el-col>
@@ -755,7 +755,7 @@ export default {
   created() {
     this.getDetail()
   },
-  component:{
+  computed:{
     isCustomer(){
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     }

src/views/deposit_home/deposit_list.vue

@@ -41,10 +41,10 @@
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程名称" prop="refProjectName">
+              <el-form-item label="使用单位" prop="refProjectName">
                 <el-input
                   v-model="screenForm.refProjectName"
-                  placeholder="请输入"
+                  placeholder="请输入使用单位"
                 />
               </el-form-item>
             </el-col>
@@ -80,7 +80,7 @@
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
+              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
               <el-option  label="默认" :value="null"></el-option>
 
                 <el-option v-for="item in refundDepositArr"
@@ -93,7 +93,7 @@
             </el-col>
    <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-              <el-select v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
+              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
               <el-option  label="默认" :value="null"></el-option>
 
                 <el-option v-for="item in examineStatusArr"
@@ -114,6 +114,58 @@
                 <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="specification">
+                <el-input
+                  v-model="screenForm.specification"
+                  placeholder="请输入机型"
+                />
+              </el-form-item>
+            </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="特价编号" prop="specialNo">
+                <el-input
+                  v-model="screenForm.specialNo"
+                  placeholder="请输入特价编号"
+                />
+              </el-form-item>
+            </el-col>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="厂编号" prop="factoryNo">
+                <el-input
+                  v-model="screenForm.factoryNo"
+                  placeholder="请输入厂编号"
+                />
+              </el-form-item>
+            </el-col>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核表" prop="refProjectName">
+                <el-input
+                  v-model="screenForm.refProjectName"
+                  placeholder="请输入审核表"
+                />
+              </el-form-item>
+            </el-col>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refProjectName">
+                <el-input
+                  v-model="screenForm.refProjectName"
+                  placeholder="请输入区域"
+                />
+              </el-form-item>
+            </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="安装日期" prop="installDate">
+                <el-date-picker
+                  v-model="screenForm.installDate"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择安装日期"
+                />
+              </el-form-item>
+            </el-col>
+              </template>
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
                 <el-button
@@ -396,7 +448,11 @@ export default {
         startSubmitTime:'',
         startConfirmTime:'',
         isRefundDeposit:null,
-        examineStatus:null
+        examineStatus:null,
+        installDate:'',
+        specification:'',
+        factoryNo:'',
+        specialNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -439,7 +495,11 @@ export default {
       ]
     }
   },
-
+  computed:{
+    isCustomer(){
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
+  },
   methods: {
     // 免扣申请
     deductionFn() {
@@ -476,7 +536,6 @@ export default {
       })
     },
     handleRadio() {
-      this.currentPage =1
       this.getList()
     },
     hanleDownloadFiles() {

src/views/sales_policy/components/Examine.vue

@@ -380,7 +380,15 @@
               </el-col>
             </el-row>
             <el-divider />
+
           </el-row>
+ <div style="margin-bottom: 20px;">
+                      <el-radio-group v-model="detail.flag+''" >
+           <el-radio label="0" :disabled="detail.flag !=0">指定经销商</el-radio>
+           <el-radio label="1" :disabled="detail.flag !=1">广州经销商</el-radio>
+            <el-radio label="2" :disabled="detail.flag !=2">佛山经销商</el-radio>
+           </el-radio-group>
+              </div>
           <template v-if="$parent.isShow != 5">
             <el-table
               v-loading="listLoading"
@@ -573,6 +581,89 @@
               </el-col>
             </el-row>
           </template>
+            <div>
+             <h4 style="display: inline-block; margin-right: 20px">
+                  经销商上限
+       </h4>
+  <el-divider />
+    </div>
+    <div>
+      <div class="table">
+      <el-table
+        v-loading="clistLoading"
+        :data="list"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+        @select-all="handleSelectionAllChange2"
+        @selection-change="handleSelectionChange2"
+      >
+        <!-- <el-table-column type="selection" width="55" align="left" /> -->
+        <el-table-column
+          prop="customerNumber"
+          label="经销商编号
+"
+          align="left"
+        >
+          <template slot-scope="scope">
+            <CopyButton :copy-text="scope.row.customerNumber" />
+            <span>{{ scope.row.customerNumber }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerName" label="经销商名称" align="left">
+          <template slot-scope="scope">
+            <CopyButton :copy-text="scope.row.customerName" />
+            <span>{{ scope.row.customerName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="materialName"
+          label="物料名称
+
+"
+          align="left"
+        >
+          <template slot-scope="scope">
+            <CopyButton :copy-text="scope.row.materialName" />
+            <span>{{ scope.row.materialName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="materialNumber"
+          label="物料编号
+"
+          align="left"
+        >
+          <template slot-scope="scope">
+            <CopyButton :copy-text="scope.row.materialNumber" />
+            <span>{{ scope.row.materialNumber }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="limitQty"
+          label="购买量上限
+
+"
+          align="left"
+        >
+        </el-table-column>
+      </el-table>
+      </div>
+      <!-- 分页 -->
+      <div style="margin: 20px 0">
+        <el-pagination
+          :current-page="policyList.currentPages"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="cTotal"
+          @size-change="handleSizeChanges4"
+          @current-change="handleCurrentChanges4"
+        />
+      </div>
+    </div>
           <div
             v-if="$parent.isShow == 8 && detail.examineStatus == 'WAIT'"
             class="descriptions diy-table-1"
@@ -633,7 +724,8 @@ import {
   getMaterialList,
   getPolicyDetail,
   toExamine,
-  updatePolicy
+  updatePolicy,
+  getPolicyList
 } from '@/api/policy_list'
 import EditCondition from './EditCondition'
 import ImageUpload from '@/components/Common/image-upload.vue'
@@ -708,6 +800,17 @@ export default {
         }
       ],
       detailFang:false,
+
+          policyList: {
+        pageNum: 1,
+        pageSize: 10,
+        policyId: "",
+        keyword: "",
+        currentPages: 1,
+      },
+      list: [],
+      cTotal: 1,
+      clistLoading: false,
     }
   },
   computed: {
@@ -755,9 +858,34 @@ export default {
         // 获取条件政策
         this.getConditionList()
         this.getCond()
+        this.getPolicyList()
       })
     },
-
+getPolicyList() {
+      this.clistLoading = true;
+      getPolicyList({
+        pageNum: this.policyList.pageNum,
+        pageSize: this.policyList.pageSize,
+        policyId: this.$parent.id,
+        keyword: this.policyList.keyword,
+      }).then((res) => {
+        this.list = res.data.records;
+        console.log(this.list, "785787");
+        this.cTotal = res.data.total;
+        this.clistLoading = false;
+      });
+    },
+          // 更改每页数量
+    handleSizeChanges4(val) {
+      this.policyList.pageSizes = val;
+      this.policyList.currentPages = 1;
+      this.getPolicyList();
+    },
+    // 更改当前页
+    handleCurrentChanges4(val) {
+      this.policyList.currentPages = val;
+      this.getPolicyList();
+    },
     getCrList() {
       const customerParams = {
         pageNum: this.currentPage,

src/views/sales_policy/components/TabelTransfer.vue

@@ -2,7 +2,7 @@
   <div class="mymain-container">
     <slot name="header">
       <el-row class="radio">
-        <el-radio-group v-model="region" @change="onChange">
+        <el-radio-group v-model="region" >
           <el-radio label="0">指定经销商</el-radio>
           <el-radio label="1">广州经销商</el-radio>
           <el-radio label="2">佛山经销商</el-radio>
@@ -138,7 +138,14 @@
         </div>
       </el-col>
     </el-row>
+    <div>
+             <h4 style="display: inline-block; margin-right: 20px">
+                  经销商上限
+       </h4>
+  <el-divider />
+    </div>
     <div style="margin: 20px 0">
+
       <el-upload
         class="import-btn cus-btn"
         :action="baseURL + 'student/import'"
@@ -166,6 +173,7 @@
           >重置</el-button
         ></el-col
       >
+
     </el-row>
     <div>
       <div class="table">
@@ -279,7 +287,7 @@ export default {
   },
   mixins: [Minxin],
   // eslint-disable-next-line vue/require-prop-types
-  props: ["code"],
+  props: ["code","yregion"],
   data() {
     return {
       keyword: "",
@@ -359,7 +367,9 @@ export default {
   },
   created() {
     this.comCode = this.code;
+
     if (this.comCode) {
+         this.region = ''+this.yregion
       this.getCond();
       this.getPolicyList();
     }

src/views/sales_policy/components/details.vue

@@ -373,6 +373,7 @@
           </div>
           <el-row>
             <el-divider />
+
             <el-row type="flex">
               <el-col :span="12">
                 <h4 style="display: inline-block; margin-right: 20px">
@@ -384,6 +385,11 @@
               </el-col>
             </el-row>
             <el-divider />
+               <el-radio-group v-model="detail.flag+''">
+          <el-radio label="0" :disabled="detail.flag !=0">指定经销商</el-radio>
+          <el-radio label="1" :disabled="detail.flag !=1">广州经销商</el-radio>
+          <el-radio label="2" :disabled="detail.flag !=2">佛山经销商</el-radio>
+        </el-radio-group>
           </el-row>
           <div class="table">
           <template v-if="$parent.isShow != 5">
@@ -608,6 +614,13 @@
         ></el-col
       >
     </el-row> -->
+     <div>
+             <h4 style="display: inline-block; margin-right: 20px">
+                  经销商上限
+       </h4>
+  <el-divider />
+    </div>
+
     <div>
       <div class="table">
       <el-table
@@ -859,6 +872,7 @@ export default {
       this.listLoading = true
       getPolicyDetail({ policyId: this.$parent.id }).then((res) => {
         this.detail = res.data
+
         this.srcList = [this.$imageUrl + this.detail.imgSrc]
         if (this.$parent.isShow == 5 && this.detail.imgSrc) {
           this.fileList = [

src/views/sales_policy/components/editPolicy.vue

@@ -388,7 +388,7 @@
                 <el-button
                   type="primary"
                   size="mini"
-                  @click="addCondition"
+                  @click="handleAddCondition"
                 >添加</el-button></el-col>
             </el-row>
             <el-divider />
@@ -452,13 +452,14 @@
             </el-row>
             <el-divider />
           </el-row>
-          <TabelTransfer v-if="detail && detail.code" :code="detail.code" @handlEditPolicy="handlEditPolicy" @handleReset="handleReset" />
+          <TabelTransfer v-if="detail && detail.code" :code="detail.code" :yregion="region" @handlEditPolicy="handlEditPolicy" @handleReset="handleReset" />
         </div>
       </div>
     </div>
     <AddCondition
       ref="comDom"
       v-show="isCondition === 1"
+
       @handleSubmitCon="handleSubmitCon"
     />
   </div>
@@ -564,7 +565,8 @@ export default {
       detail: {},
       rebateList: [],
       cid:'',
-      cpolicyId:''
+      cpolicyId:'',
+      region:0
     }
   },
   computed: {
@@ -598,8 +600,9 @@ export default {
         this.$successMsg('删除成功')
       })
     },
-    addCondition() {
+    handleAddCondition() {
       this.isCondition = 1
+      console.log(this.conditionList[0].id,this.searchForm.code);
       this.$refs.comDom.getCommonApi(this.conditionList[0].id)
       this.$store.commit('sales/setId', this.searchForm.code)
     },
@@ -777,7 +780,7 @@ export default {
           title: this.detail.title,
           type: this.detail.type
         },
-
+        this.region = res.data.flag
         this.srcList = [this.$imageUrl + this.detail.imgSrc]
         if (this.$parent.isShow === 5 && this.detail.imgSrc) {
           this.fileList = [

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

@@ -441,7 +441,7 @@
           size="small"
         >
           <el-row v-if="factor.length && !dataList.length" style="margin: 0 0 20px 0;font-size: 20px;">
-            引用销售政策说明：{{ !remark ? factor[0].name : remark }} 配提比列：{{ pop }}
+            引用销售政策说明：{{ !remark ? factor[0].name : remark }} 配提比例：{{ pop }}
           </el-row>
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="11">