【修改】bug

src/components/Common/image-upload.vue

@@ -165,8 +165,9 @@ export default {
         getOssConfig().then(res => {
           const fileKey = this.createName(fileName)
 
-          res.data.name = fileName
+          res.data.name =  fileName
           res.data.key = res.data.dir + fileKey
+
           resolve(res.data)
         }).catch(res => {
           resolve({})
@@ -202,23 +203,10 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)'
       })
 
-      const fileName = file.name.substring(0, file.name.lastIndexOf('.'))
-      let suffix = file.name.match(/.[^.]+$/)[0]
-      console.log(suffix,fileName);
-      // 押金申请上传限制
-      if (this.startRestricting) {
-        const filterKeywords = this.restrictFilename.filter(k => fileName.includes(k))
-        console.log(filterKeywords)
-        if (!filterKeywords.length || suffix.includes('zip', 'rar', 'gz', 'apk')) {
-          this.fileName = `其他文件${suffix}`
-          suffix = ''
-        }
-
-      }
-
-      this.$emit('handleIsFileName',file.name)
-      this.dataObj = await this.getOssConfig( file.name)
-      console.log(this.dataObj,'56565' );
+       this.getFileName(file.name)
+      this.$emit('handleIsFileName',this.fileName)
+      this.dataObj = await this.getOssConfig( this.fileName)
+      console.log(this.dataObj,'ppp');
       this.waitUploadList.push(this.dataObj)
     },
 
@@ -240,7 +228,9 @@ export default {
         })
         this.waitUploadList = []
       } else {
-        const index = findElem(this.waitUploadList, 'name', file.name)
+          this.getFileName(file.name)
+        const index = findElem(this.waitUploadList, 'name',this.fileName)
+
         this.fileList.push({
           name: this.waitUploadList[index].name,
           url: this.waitUploadList[index].key,
@@ -251,6 +241,22 @@ export default {
       }
       this.showFileList = true
       loading.close()
+    },
+
+    getFileName(name){
+         const fileName = name.substring(0, name.lastIndexOf('.'))
+      let suffix = name.match(/.[^.]+$/)[0]
+      console.log(suffix,fileName);
+      // 押金申请上传限制
+      this.fileName = name
+      if (this.startRestricting) {
+        const filterKeywords = this.restrictFilename.filter(k => fileName.includes(k))
+        console.log(filterKeywords)
+        if (!filterKeywords.length || suffix.includes('zip', 'rar', 'gz', 'apk')) {
+          this.fileName = `其他文件${suffix}`
+        }
+
+      }
     }
   }
 }

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

@@ -363,10 +363,11 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="18"  v-if="isCustomer">
+          <el-col :xs="24" :sm="12" :lg="18"  v-if="details.checkBy && details.checkDate">
             <el-form-item label="验收说明
-" prop="checkNote">
+              " prop="checkNote">
               <el-input
+                disabled
                 v-model="details.checkNote"
                 type="textarea"
                 placeholder="请输入验收说明
@@ -446,15 +447,15 @@ export default {
         return
       }
       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)
-        //     }
-        //   })
-        // }
+        //  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)
+            }
+          })
+        }
 
         arr.push({
           dataDescribe: el.name,
@@ -465,7 +466,7 @@ export default {
       })
       applyDeposit({
         ...this.details,
-        dataList:arr
+        dataList:[...arr,...this.details.dataList]
       }).then((res) => {
         this.$successMsg('申请成功')
         this.$parent.showPage = 1
@@ -520,7 +521,7 @@ export default {
       } else {
         return ''
       }
-    },
+    }
   }
 }
 </script>

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

@@ -9,6 +9,7 @@
       <el-radio-button label="工程订单信息" />
       <el-radio-button label="工程发货信息" />
       <el-radio-button label="直调发货" />
+       <el-radio-button label="历史记录" />
     </el-radio-group>
     <br><br>
 
@@ -79,11 +80,14 @@
               <div class="label">格力备注</div>
               <div class="value">{{ details.geLiInerNote }}</div>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="24" class="item">
+            <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">使用单位</div>
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
-
+<el-col :xs="24" :sm="24" :lg="12" class="item">
+              <div class="label">跨区厂编号</div>
+              <div class="value">{{ details.refFactoryNo }}</div>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
               <div class="label">安装时间</div>
               <div class="value" style="padding: 0">
@@ -739,6 +743,92 @@
         </el-table>
       </div>
     </div>
+    <div v-show="engineering == '历史记录'">
+      <h3>历史记录</h3>
+      <el-divider />
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="details.checkRecordItems"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <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="applyNote"
+              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="checkNote"
+              min-width="160"
+              show-overflow-tooltip
+            >
+                <template slot-scope="scope">
+              {{scope.row.checkNote?'是':'否'}}
+              </template>
+            </el-table-column>
+                <el-table-column
+              align="left"
+              label="提交人
+"
+              prop="submitBy"
+              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>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 

src/views/deposit_commerce/deposit_list.vue

@@ -41,9 +41,9 @@
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refProjectName">
+              <el-form-item label="使用单位" prop="refUseUnit">
                 <el-input
-                  v-model="screenForm.refProjectName"
+                  v-model="screenForm.refUseUnit"
                   placeholder="请输入"
                 />
               </el-form-item>
@@ -69,7 +69,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"
@@ -79,6 +79,16 @@
               </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>
@@ -116,49 +126,59 @@
             </el-col> -->
                    <template v-if="!isCustomer">
                    <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="机型" prop="refProjectName">
+              <el-form-item label="机型" prop="specification">
                 <el-input
-                  v-model="screenForm.refProjectName"
+                  v-model="screenForm.specification"
                   placeholder="请输入机型"
                 />
               </el-form-item>
             </el-col>
                <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="特价编号" prop="refProjectName">
+              <el-form-item label="特价编号" prop="specialNo">
                 <el-input
-                  v-model="screenForm.refProjectName"
+                  v-model="screenForm.specialNo"
                   placeholder="请输入特价编号"
                 />
               </el-form-item>
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="厂编号" prop="refProjectName">
+              <el-form-item label="厂编号" prop="refFactoryNo">
                 <el-input
-                  v-model="screenForm.refProjectName"
+                  v-model="screenForm.refFactoryNo"
                   placeholder="请输入厂编号"
                 />
               </el-form-item>
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核表" prop="refProjectName">
+              <el-form-item label="审核人" prop="confirmName">
                 <el-input
-                  v-model="screenForm.refProjectName"
-                  placeholder="请输入审核表"
+                  v-model="screenForm.confirmName"
+                  placeholder="请输入审核人"
                 />
               </el-form-item>
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refProjectName">
+              <el-form-item label="区域" prop="refRegionWork">
                 <el-input
-                  v-model="screenForm.refProjectName"
+                  v-model="screenForm.refRegionWork"
                   placeholder="请输入区域"
                 />
               </el-form-item>
             </el-col>
                <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="安装日期" prop="startConfirmTime">
+              <el-form-item label="开始安装日期" prop="startInstallTime">
                 <el-date-picker
-                  v-model="screenForm.startConfirmTime"
+                  v-model="screenForm.startInstallTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择安装日期"
+                />
+              </el-form-item>
+            </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束安装日期" prop="endInstallTime">
+                <el-date-picker
+                  v-model="screenForm.endInstallTime"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择安装日期"
@@ -449,10 +469,15 @@ export default {
         startConfirmTime:'',
         isRefundDeposit:null,
         examineStatus:null,
-         installDate:'',
+          refUseUnit:'',
+        startInstallTime:'',
+          endConfirmTime:'',
+        endInstallTime:'',
         specification:'',
         factoryNo:'',
-        specialNo:''
+        specialNo:'',
+        confirmName:'',
+        refRegionWork:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -545,7 +570,7 @@ export default {
         for (let i = 0; i < this.selectData.length; i++) {
           arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles('/deposit-manage/export', { id: arr })
+        downloadFiles('/deposit-manage/export', { id: arr,orderType:'TRADE' })
       } else {
         this.$errorMsg('请选择押金项')
       }

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

@@ -363,11 +363,12 @@
               />
             </el-form-item>
           </el-col>
-            <el-col :xs="24" :sm="12" :lg="18"  v-if="isCustomer">
+            <el-col :xs="24" :sm="12" :lg="18"  v-if="details.checkBy && details.checkDate">
             <el-form-item label="验收说明
 " prop="checkNote">
               <el-input
                 v-model="details.checkNote"
+                 disabled
                 type="textarea"
                 placeholder="请输入验收说明
 "
@@ -446,7 +447,7 @@ export default {
         return
       }
       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)
@@ -465,7 +466,7 @@ export default {
       })
       applyDeposit({
         ...this.details,
-        dataList:arr
+        dataList:[...arr,...this.details.dataList]
       }).then((res) => {
         this.$successMsg('申请成功')
         this.$parent.showPage = 1

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

@@ -9,6 +9,7 @@
       <el-radio-button label="工程订单信息" />
       <el-radio-button label="工程发货信息" />
       <el-radio-button label="直调发货" />
+         <el-radio-button label="历史记录" />
     </el-radio-group>
     <br><br>
 
@@ -79,11 +80,14 @@
               <div class="label">格力备注</div>
               <div class="value">{{ details.geLiInerNote }}</div>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="24" class="item">
+             <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">使用单位</div>
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
-
+<el-col :xs="24" :sm="24" :lg="12" class="item">
+              <div class="label">跨区厂编号</div>
+              <div class="value">{{ details.refFactoryNo }}</div>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
               <div class="label">安装时间</div>
               <div class="value" style="padding: 0">
@@ -739,6 +743,92 @@
         </el-table>
       </div>
     </div>
+       <div v-show="engineering == '历史记录'">
+      <h3>历史记录</h3>
+      <el-divider />
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="details.checkRecordItems"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <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="applyNote"
+              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="checkNote"
+              min-width="160"
+              show-overflow-tooltip
+            >
+                <template slot-scope="scope">
+              {{scope.row.checkNote?'是':'否'}}
+              </template>
+            </el-table-column>
+                <el-table-column
+              align="left"
+              label="提交人
+"
+              prop="submitBy"
+              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>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 

src/views/deposit_home/deposit_list.vue

@@ -41,9 +41,9 @@
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refProjectName">
+              <el-form-item label="使用单位" prop="refUseUnit">
                 <el-input
-                  v-model="screenForm.refProjectName"
+                  v-model="screenForm.refUseUnit"
                   placeholder="请输入使用单位"
                 />
               </el-form-item>
@@ -69,7 +69,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"
@@ -79,6 +79,16 @@
               </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>
@@ -140,25 +150,35 @@
               </el-form-item>
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核表" prop="refProjectName">
+              <el-form-item label="审核人" prop="confirmName">
                 <el-input
-                  v-model="screenForm.refProjectName"
-                  placeholder="请输入审核表"
+                  v-model="screenForm.confirmName"
+                  placeholder="请输入审核人"
                 />
               </el-form-item>
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refProjectName">
+              <el-form-item label="区域" prop="refRegionWork">
                 <el-input
-                  v-model="screenForm.refProjectName"
+                  v-model="screenForm.refRegionWork"
                   placeholder="请输入区域"
                 />
               </el-form-item>
             </el-col>
                <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="安装日期" prop="installDate">
+              <el-form-item label="开始安装日期" prop="startInstallTime">
+                <el-date-picker
+                  v-model="screenForm.startInstallTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择安装日期"
+                />
+              </el-form-item>
+            </el-col>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束安装日期" prop="endInstallTime">
                 <el-date-picker
-                  v-model="screenForm.installDate"
+                  v-model="screenForm.endInstallTime"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择安装日期"
@@ -449,10 +469,15 @@ export default {
         startConfirmTime:'',
         isRefundDeposit:null,
         examineStatus:null,
-        installDate:'',
+        refUseUnit:'',
+        endConfirmTime:'',
+        startInstallTime:'',
+        endInstallTime:'',
         specification:'',
         factoryNo:'',
-        specialNo:''
+        specialNo:'',
+        confirmName:'',
+        refRegionWork:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -544,7 +569,7 @@ export default {
         for (let i = 0; i < this.selectData.length; i++) {
           arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles('/deposit-manage/export', { id: arr })
+        downloadFiles('/deposit-manage/export', { id: arr,orderType:'HOME' })
       } else {
         this.$errorMsg('请选择押金项')
       }

src/views/sales_policy/components/details.vue

@@ -32,7 +32,8 @@
             <el-col :span="24" class="item">
               <div class="label">销售政策类型</div>
               <div class="value">
-                <el-select
+                {{detail.type}}
+                <!-- <el-select
                   v-model="detail.type"
                   size="mini"
                   placeholder="销售政策类型"
@@ -44,7 +45,7 @@
                     :label="item.label"
                     :value="item.value"
                   />
-                </el-select>
+                </el-select> -->
 
               </div>
             </el-col>

src/views/setting/account.vue

@@ -620,9 +620,7 @@ export default {
         correspondIds: [
           { required: true, message: "请选择可用仓库", trigger: "change" },
         ],
-        k3CategoryIds: [
-          { required: true, message: "请选择物料分类", trigger: "change" },
-        ],
+
         newPassword: [
           { required: true, validator: validatePass3, trigger: "blur" },
         ],

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

@@ -264,6 +264,20 @@
             min-width="100"
             show-overflow-tooltip
           />
+           <el-table-column
+              align="left"
+              label="业务员"
+              prop="k3ServiceName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+             <el-table-column
+              align="left"
+              label="表体业务员"
+              prop="seviceName"
+              min-width="100"
+              show-overflow-tooltip
+            />
           <el-table-column
             align="left"
             label="备注"

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

@@ -236,6 +236,20 @@
           min-width="100"
           show-overflow-tooltip
         ></el-table-column>
+         <el-table-column
+              align="left"
+              label="业务员"
+              prop="k3ServiceName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+             <el-table-column
+              align="left"
+              label="表体业务员"
+              prop="seviceName"
+              min-width="100"
+              show-overflow-tooltip
+            />
         <el-table-column
           align="center"
           label="备注"

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

@@ -1132,7 +1132,8 @@ export default {
         pageSize: -1,
         policyConditionId,
         popType,
-        specification:this.screenForm.specification
+        specification:this.screenForm.specification,
+         saleTypeCode: this.screenForm.saleTypeCode,
       })
 
       if (!fang) {
@@ -1202,6 +1203,7 @@ export default {
         pageSize: -1,
         policyId: this.screenForm.policyId,
         saleTypeCode: this.screenForm.saleTypeCode,
+        specification:this.screenForm.specification,
         [val]: true
       }).then((res) => {
         this.dataList = res.data.records

src/views/supply/policy/policy_list.vue

@@ -396,6 +396,14 @@
               min-width="100"
               show-overflow-tooltip
             />
+             <el-table-column
+              align="left"
+              label="表体业务员"
+              prop="seviceName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+
             <el-table-column
               align="left"
               label="制表人"