fix: 押金申请退押

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

@@ -80,13 +80,13 @@
             </div>
           </el-col>
           <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
-              <div class="label">格力内部资料备注</div>
-              <div class="value">{{ details.geLiInnerDataNote }}</div>
-            </el-col>
-            <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
-              <div class="label">订单格力内部备注</div>
-              <div class="value">{{ details.orderGeLiInnerNote }}</div>
-            </el-col>
+            <div class="label">格力内部资料备注</div>
+            <div class="value">{{ details.geLiInnerDataNote }}</div>
+          </el-col>
+          <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
+            <div class="label">订单格力内部备注</div>
+            <div class="value">{{ details.orderGeLiInnerNote }}</div>
+          </el-col>
           <el-col :xs="24" :sm="24" :lg="24" class="item">
             <div class="label">使用单位</div>
             <div class="value">{{ details.refUseUnit }}</div>
@@ -118,13 +118,14 @@
           <el-col :xs="24" :sm="24" :lg="8" class="item">
             <div class="label">实际使用单位</div>
             <div class="value">
-              {{ details.realUseUnit }}
+              <el-input v-model="details.realUseUnit" :readonly="isCustomer" placeholder="实际使用单位" />
             </div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
             <div class="label">实际安装地址</div>
             <div class="value">
-              {{ details.realInstallAddress }}
+              <el-input v-model="details.realInstallAddress" :readonly="isCustomer" placeholder="实际安装地址" />
+
             </div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -136,7 +137,8 @@
           <el-col :xs="24" :sm="24" :lg="8" class="item">
             <div class="label">购买单位</div>
             <div class="value">
-              {{ details.refBuyUnitName }}
+              <el-input v-model="details.refBuyUnitName" :readonly="isCustomer" placeholder="购买单位" />
+
             </div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -425,7 +427,7 @@
               <span>{{ scope.row.materialOldNumber }}</span>
             </template>
           </el-table-column>
- 
+
           <el-table-column align="left" label="已发押金数量" prop="hasSendQty" min-width="130" show-overflow-tooltip />
           <el-table-column align="left" label="单价" prop="price" min-width="130" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -645,7 +647,7 @@ export default {
   },
   computed: {
     isCustomer() {
-      return this.$store.getters.customerId && this.$store.getters.customerNumber
+      return !!(this.$store.getters.customerId && this.$store.getters.customerNumber)
     },
     comTotal() {
       return (qty, price) => {
@@ -697,8 +699,8 @@ export default {
           item.sums2 = ['price', 'refundDepositAmount', 'depositAmount']
         })
         res.data.items = arr
-        res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
-          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
+        res.data.realUseUnit = res.data.realUseUnit || res.data.refUseUnit
+        res.data.realInstallAddress = res.data.realInstallAddress || res.data.refInstallAddress
         this.details = res.data
       })
     },

src/views/deposit_home/components/deposit_replenish.vue

@@ -11,7 +11,7 @@
       <!-- <el-radio-button label="直调发货" /> -->
       <el-radio-button label="历史记录" />
     </el-radio-group>
-    <br /><br />
+    <br><br>
 
     <div v-show="engineering == '工程押金信息'">
       <div class="diy-table-1">
@@ -76,10 +76,10 @@
               <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 v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
               <div class="label">格力内部备注</div>
               <div class="value">
-                <el-input v-model="details.geLiInerNote" placeholder="格力内部备注"></el-input>
+                <el-input v-model="details.geLiInerNote" placeholder="格力内部备注" />
               </div>
             </el-col>
             <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
@@ -128,13 +128,14 @@
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">实际使用单位</div>
               <div class="value">
-                {{ details.realUseUnit }}
+                <el-input v-model="details.realUseUnit" :readonly="isCustomer" placeholder="实际使用单位" />
               </div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">实际安装地址</div>
               <div class="value">
-                {{ details.realInstallAddress }}
+                <el-input v-model="details.realInstallAddress" :readonly="isCustomer" placeholder="实际安装地址" />
+
               </div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -146,7 +147,7 @@
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">购买单位</div>
               <div class="value">
-                {{ details.refBuyUnitName }}
+                <el-input v-model="details.refBuyUnitName" :readonly="isCustomer" placeholder="购买单位" />
               </div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -240,7 +241,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.factoryNo" />
+                <CopyButton :copy-text="scope.row.factoryNo" />
                 <span>{{ scope.row.factoryNo }}</span>
               </template>
             </el-table-column>
@@ -253,13 +254,13 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specialNo" />
+                <CopyButton :copy-text="scope.row.specialNo" />
                 <span>{{ scope.row.specialNo }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialNumber" />
+                <CopyButton :copy-text="scope.row.materialNumber" />
                 <span>{{ scope.row.materialNumber }}</span>
               </template>
             </el-table-column>
@@ -271,19 +272,19 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
                 <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
+                <CopyButton :copy-text="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>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
+                <CopyButton :copy-text="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
@@ -478,7 +479,7 @@
                 <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-       
+
             <el-table-column align="left" label="已发押金数量" prop="hasSendQty" min-width="130" show-overflow-tooltip />
             <el-table-column align="left" label="单价" prop="price" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -499,8 +500,13 @@
         </div>
       </div>
       <h3 class="gdzl">工程资料</h3>
-      <el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"
-        >批量下载
+      <el-button
+        :disabled="isDis"
+        class="batchDownload"
+        type="primary"
+        size="small"
+        @click="batchDownloadFn"
+      >批量下载
       </el-button>
 
       <el-divider />
@@ -529,9 +535,9 @@
                   fit="cover"
                   :preview-src-list="[imageURL + scope.row.fileUrl]"
                 />
-                <img v-if="checkFileType(scope.row.fileUrl) == 'word'" class="file" src="@/assets/common/word.png" />
-                <img v-if="checkFileType(scope.row.fileUrl) == 'excel'" class="file" src="@/assets/common/excel.png" />
-                <img v-if="checkFileType(scope.row.fileUrl) == 'ppt'" class="file" src="@/assets/common/ppt.png" />
+                <img v-if="checkFileType(scope.row.fileUrl) == 'word'" class="file" src="@/assets/common/word.png">
+                <img v-if="checkFileType(scope.row.fileUrl) == 'excel'" class="file" src="@/assets/common/excel.png">
+                <img v-if="checkFileType(scope.row.fileUrl) == 'ppt'" class="file" src="@/assets/common/ppt.png">
 
                 <img
                   v-if="checkFileType(scope.row.fileUrl) == 'pdf'"
@@ -539,13 +545,13 @@
                   style="cursor: pointer"
                   src="@/assets/common/pdf.png"
                   @click="openPdf(scope.row.fileUrl)"
-                />
+                >
 
                 <img
                   v-if="checkFileType(scope.row.fileUrl) == 'file'"
                   class="file aaa"
                   src="@/assets/common/zip.jpeg"
-                />
+                >
               </template>
             </el-table-column>
             <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160" show-overflow-tooltip>
@@ -555,8 +561,11 @@
             </el-table-column>
             <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-button type="text" class="textColor" @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
-                  >下载
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
+                >下载
                 </el-button>
                 <!--                <el-button-->
                 <!--                  v-if="checkFileType(scope.row.fileUrl) == 'pdf'"-->
@@ -662,19 +671,19 @@
                     fit="cover"
                     :preview-src-list="[imageURL + scope.row.fileUrl]"
                   />
-                  <img v-if="checkFileType(scope.row.fileUrl) == 'word'" class="file" src="@/assets/common/word.png" />
+                  <img v-if="checkFileType(scope.row.fileUrl) == 'word'" class="file" src="@/assets/common/word.png">
                   <img
                     v-if="checkFileType(scope.row.fileUrl) == 'excel'"
                     class="file"
                     src="@/assets/common/excel.png"
-                  />
-                  <img v-if="checkFileType(scope.row.fileUrl) == 'ppt'" class="file" src="@/assets/common/ppt.png" />
-                  <img v-if="checkFileType(scope.row.fileUrl) == 'pdf'" class="file" src="@/assets/common/pdf.png" />
+                  >
+                  <img v-if="checkFileType(scope.row.fileUrl) == 'ppt'" class="file" src="@/assets/common/ppt.png">
+                  <img v-if="checkFileType(scope.row.fileUrl) == 'pdf'" class="file" src="@/assets/common/pdf.png">
                   <img
                     v-if="checkFileType(scope.row.fileUrl) == 'file'"
                     class="file aaa"
                     src="@/assets/common/zip.jpeg"
-                  />
+                  >
                 </template>
               </el-table-column>
               <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160" show-overflow-tooltip>
@@ -684,15 +693,17 @@
               </el-table-column>
               <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-button type="text" class="textColor" @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
-                    >下载</el-button
-                  >
+                  <el-button
+                    type="text"
+                    class="textColor"
+                    @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
+                  >下载</el-button>
                   <el-popconfirm
                     style="margin-left: 10px"
                     title="这是一段内容确定删除吗？"
                     @onConfirm="delFile(scope.$index, scope.row.id)"
                   >
-                    <el-button type="text" slot="reference">删除</el-button>
+                    <el-button slot="reference" type="text">删除</el-button>
                   </el-popconfirm>
                 </template>
               </el-table-column>
@@ -747,7 +758,7 @@
                 <el-col :xs="12" :sm="24" :lg="24" class="item">
                   <div class="label">复核说明</div>
                   <div class="value">
-                    <input v-model="details.reviewRemark" type="text" />
+                    <input v-model="details.reviewRemark" type="text">
                   </div>
                 </el-col>
               </el-row>
@@ -759,9 +770,9 @@
         <div
           v-if="
             details.examineStatus == 'OK' ||
-            details.dataState == 'WAIT_REVIEW' ||
-            details.dataState == 'AMEND' ||
-            details.dataState == 'REVIEW'
+              details.dataState == 'WAIT_REVIEW' ||
+              details.dataState == 'AMEND' ||
+              details.dataState == 'REVIEW'
           "
         >
           <div>
@@ -837,20 +848,20 @@
           >
             <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.enginOrderNo" />
+                <CopyButton :copy-text="scope.row.enginOrderNo" />
                 <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="订单日期" prop="orderDate" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
+                <CopyButton :copy-text="scope.row.materialName" />
                 <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
+                <CopyButton :copy-text="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
@@ -892,20 +903,20 @@
           >
             <el-table-column align="left" label="发货单" prop="id" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.id" />
+                <CopyButton :copy-text="scope.row.id" />
                 <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="发货申请日期" prop="theTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
+                <CopyButton :copy-text="scope.row.materialName" />
                 <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
+                <CopyButton :copy-text="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
@@ -935,20 +946,20 @@
         <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe>
           <el-table-column align="left" label="发货单" prop="id" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.id" />
+              <CopyButton :copy-text="scope.row.id" />
               <span>{{ scope.row.id }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="发货申请日期" prop="orderTime" min-width="160" show-overflow-tooltip />
           <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialName" />
+              <CopyButton :copy-text="scope.row.materialName" />
               <span>{{ scope.row.materialName }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specification" />
+              <CopyButton :copy-text="scope.row.specification" />
               <span>{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
@@ -988,10 +999,8 @@
             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="checkName" min-width="160" show-overflow-tooltip>
-            </el-table-column>
+            <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="验收人" prop="checkName" min-width="160" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="申请退押金备注
@@ -999,8 +1008,7 @@
               prop="applyNote"
               min-width="160"
               show-overflow-tooltip
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="left"
               label="验收说明
@@ -1008,8 +1016,7 @@
               prop="checkNote"
               min-width="160"
               show-overflow-tooltip
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="left"
               label="是否退押
@@ -1029,10 +1036,8 @@
               prop="submitName"
               min-width="160"
               show-overflow-tooltip
-            >
-            </el-table-column>
-            <el-table-column align="left" label="提交时间" prop="submitTime" min-width="160" show-overflow-tooltip>
-            </el-table-column>
+            />
+            <el-table-column align="left" label="提交时间" prop="submitTime" min-width="160" show-overflow-tooltip />
           </el-table>
         </div>
       </div>
@@ -1049,6 +1054,9 @@ import { getFileUrl } from '@/api/common'
 import imageUpload from '@/components/Common/image-upload.vue'
 
 export default {
+  components: {
+    imageUpload
+  },
   props: {
     depositManageId: {
       type: [String, Number],
@@ -1059,9 +1067,6 @@ export default {
       default: null
     }
   },
-  components: {
-    imageUpload
-  },
   data() {
     return {
       isDis: true,
@@ -1096,14 +1101,14 @@ export default {
       restrictFilename: ['结算单', '合同', '明细表', '审核表', '收据', '发票', '照片', '相片']
     }
   },
-  created() {
-    this.getDetail()
-  },
   computed: {
     isCustomer() {
-      return this.$store.getters.customerId && this.$store.getters.customerNumber
+      return !!(this.$store.getters.customerId && this.$store.getters.customerNumber)
     }
   },
+  created() {
+    this.getDetail()
+  },
   methods: {
     getDetail() {
       if (this.engineering == '工程押金信息') {
@@ -1113,7 +1118,7 @@ export default {
           } else {
             this.isDis = false
           }
-          let arr = []
+          const arr = []
           res.data.items.forEach(item => {
             if (Number(item.qty) > 0) {
               arr.push(item)
@@ -1123,16 +1128,15 @@ export default {
             item.sums2 = ['totalAmount', 'diffAmount', 'price', 'depositAmount', 'contractPrice', 'contractAmount']
           })
           res.data.collectList.forEach(item => {
-
-// item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-item.sums1 = ['orderHasSendQty', 'dataQty', 'hasSendQty']
-item.sums2 = [ 'price', 'refundDepositAmount', 'depositAmount']
-})
+            // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'hasSendQty']
+            item.sums2 = ['price', 'refundDepositAmount', 'depositAmount']
+          })
           res.data.items = arr
           this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
           this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')
-          res.data.realUseUnit =res.data.realUseUnit || res.data.refUseUnit
-          res.data.realInstallAddress =   res.data.realInstallAddress ||res.data.refInstallAddress
+          res.data.realUseUnit = res.data.realUseUnit || res.data.refUseUnit
+          res.data.realInstallAddress = res.data.realInstallAddress || res.data.refInstallAddress
           this.details = res.data
         })
       } else if (this.engineering == '工程订单信息') {