Procházet zdrojové kódy

feat: 押金退押 增加 押金货品信息列表

zh před 2 roky
rodič
revize
e46aa4bf84

+ 196 - 92
src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -102,83 +102,83 @@
             </div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">登录有效期</div>
-              <div class="value">
-                {{ details.refBillsExpireDate }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">实际使用单位</div>
-              <div class="value">
-                {{ details.realUseUnit }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">实际安装地址</div>
-              <div class="value">
-                {{ details.realInstallAddress }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">项目编号</div>
-              <div class="value">
-                {{ details.refProjectNo }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">购买单位</div>
-              <div class="value">
-                {{ details.refBuyUnitName }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">合同变更批复意见</div>
-              <div class="value">
-                {{ details.refContractIdea }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">合同变更批复结果</div>
-              <div class="value">
-                {{ details.refContractResult }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">资料延期批复意见</div>
-              <div class="value">
-                {{ details.refDataDelayResult }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">资料延期批复结果</div>
-              <div class="value">
-                {{ details.refInstallAddress }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">工程机转零售批复意见</div>
-              <div class="value">
-                {{ details.refToRetailIdea }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">工程机转零售批复结果</div>
-              <div class="value">
-                {{ details.refToRetailResult }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">其他附件审批意见</div>
-              <div class="value">
-                {{ details.refOtherAnnexIdea }}
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">其他附件批复结果</div>
-              <div class="value">
-                {{ details.refOtherAnnexResult }}
-              </div>
-            </el-col>
+            <div class="label">登录有效期</div>
+            <div class="value">
+              {{ details.refBillsExpireDate }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">实际使用单位</div>
+            <div class="value">
+              {{ details.realUseUnit }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">实际安装地址</div>
+            <div class="value">
+              {{ details.realInstallAddress }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">项目编号</div>
+            <div class="value">
+              {{ details.refProjectNo }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">购买单位</div>
+            <div class="value">
+              {{ details.refBuyUnitName }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">合同变更批复意见</div>
+            <div class="value">
+              {{ details.refContractIdea }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">合同变更批复结果</div>
+            <div class="value">
+              {{ details.refContractResult }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">资料延期批复意见</div>
+            <div class="value">
+              {{ details.refDataDelayResult }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">资料延期批复结果</div>
+            <div class="value">
+              {{ details.refInstallAddress }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">工程机转零售批复意见</div>
+            <div class="value">
+              {{ details.refToRetailIdea }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">工程机转零售批复结果</div>
+            <div class="value">
+              {{ details.refToRetailResult }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">其他附件审批意见</div>
+            <div class="value">
+              {{ details.refOtherAnnexIdea }}
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <div class="label">其他附件批复结果</div>
+            <div class="value">
+              {{ details.refOtherAnnexResult }}
+            </div>
+          </el-col>
           <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
             <div class="label">寄厂日期</div>
             <div class="value" style="padding: 0">
@@ -276,11 +276,11 @@
             </template>
           </el-table-column>
           <el-table-column align="right" label="销售数量" prop="salesQty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="right" label="销售金额" prop="salesAmount" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ scope.row.salesAmount | numToFixed }}
-              </template>
-            </el-table-column>
+          <el-table-column align="right" label="销售金额" prop="salesAmount" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.salesAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="押金数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
           <el-table-column
             align="center"
@@ -341,6 +341,106 @@
         </el-table>
       </div>
     </div>
+    <h3>押金货品信息</h3>
+    <el-divider />
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="details.collectList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          show-summary
+          :summary-method="$getSummaries"
+        >
+          <el-table-column align="left" label="工程登录单号" prop="refEnginRecordNo" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+              <span>{{ scope.row.refEnginRecordNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.specification" />
+              <span>{{ scope.row.specification }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="基本单位编码" prop="unit" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.unit" />
+              <span>{{ scope.row.unit }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.customerWalletName" />
+              <span>{{ scope.row.customerWalletName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="现金钱包编码" prop="customerWalletNumber" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.customerWalletNumber" />
+              <span>{{ scope.row.customerWalletNumber }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="金蝶物料类型名称" prop="k3CategoryName" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.k3CategoryName" />
+              <span>{{ scope.row.k3CategoryName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="金蝶物料类型编码" prop="k3CategoryNumber" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.k3CategoryNumber" />
+              <span>{{ scope.row.k3CategoryNumber }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="金蝶物料名称" prop="materialName" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.materialName" />
+              <span>{{ scope.row.materialName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="金蝶物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.materialNumber" />
+              <span>{{ scope.row.materialNumber }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="金蝶物料旧编码" prop="materialOldNumber" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.materialOldNumber" />
+              <span>{{ scope.row.materialOldNumber }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.depositAmount | numToFixed }}
+            </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">
+              {{ scope.row.price | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="已退押金金额" prop="refundDepositAmount" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.refundDepositAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.depositAmount | numToFixed }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
     <h3>上传资料</h3>
     <el-divider />
     <!-- 筛选条件 -->
@@ -398,17 +498,17 @@
                         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'"
@@ -416,13 +516,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
@@ -442,8 +542,7 @@
                         type="text"
                         class="textColor"
                         @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
-                        >下载</el-button
-                      >
+                      >下载</el-button>
                       <el-popconfirm
                         style="margin-left: 10px"
                         title="这是一段内容确定删除吗?"
@@ -517,6 +616,9 @@ import { downloadFiles, downloadPdf } from '@/utils/util'
 import { getFileUrl } from '@/api/common'
 
 export default {
+  components: {
+    imageUpload
+  },
   props: {
     depositManageId: {
       type: [String, Number],
@@ -527,9 +629,6 @@ export default {
       default: null
     }
   },
-  components: {
-    imageUpload
-  },
   data() {
     return {
       isDis: true,
@@ -588,6 +687,11 @@ export default {
             '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']
+        })
         res.data.items = arr
         this.details = res.data
       })

+ 170 - 60
src/views/deposit_home/components/deposit_list-detail.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 :xs="24" :sm="24" :lg="12" class="item">
@@ -232,7 +232,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>
@@ -245,13 +245,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>
@@ -263,19 +263,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>
@@ -394,9 +394,114 @@
           </el-table>
         </div>
       </div>
+      <h3>押金货品信息</h3>
+      <el-divider />
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="details.collectList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="left" label="工程登录单号" prop="refEnginRecordNo" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <span>{{ scope.row.refEnginRecordNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="基本单位编码" prop="unit" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.unit" />
+                <span>{{ scope.row.unit }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletName" />
+                <span>{{ scope.row.customerWalletName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包编码" prop="customerWalletNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletNumber" />
+                <span>{{ scope.row.customerWalletNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型名称" prop="k3CategoryName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryName" />
+                <span>{{ scope.row.k3CategoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型编码" prop="k3CategoryNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryNumber" />
+                <span>{{ scope.row.k3CategoryNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料名称" prop="materialName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialName" />
+                <span>{{ scope.row.materialName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialNumber" />
+                <span>{{ scope.row.materialNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料旧编码" prop="materialOldNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
+                <span>{{ scope.row.materialOldNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </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">
+                {{ scope.row.price | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="已退押金金额" prop="refundDepositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.refundDepositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </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 />
@@ -425,9 +530,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'"
@@ -435,13 +540,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>
@@ -451,8 +556,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'"-->
@@ -563,19 +671,19 @@
                       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
@@ -591,9 +699,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
-                    >
+                    <el-button
+                      type="text"
+                      class="textColor"
+                      @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
+                    >下载</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -647,7 +757,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>
@@ -661,26 +771,26 @@
         <el-button
           v-if="
             (details.examineStatus != 'OK' || (!isCustomer && details.examineStatus == 'OK')) &&
-            details.dataState != 'WAIT_REVIEW' &&
-            details.dataState != 'AMEND' &&
-            details.dataState != 'REVIEW'
+              details.dataState != 'WAIT_REVIEW' &&
+              details.dataState != 'AMEND' &&
+              details.dataState != 'REVIEW'
           "
           type="primary"
           size="small"
           @click="handleSvse"
-          >保存
+        >保存
         </el-button>
         <el-button
           v-if="
             (details.examineStatus != 'OK' || (!isCustomer && details.examineStatus == 'OK')) &&
-            details.dataState != 'WAIT_REVIEW' &&
-            details.dataState != 'AMEND' &&
-            details.dataState != 'REVIEW'
+              details.dataState != 'WAIT_REVIEW' &&
+              details.dataState != 'AMEND' &&
+              details.dataState != 'REVIEW'
           "
           type="primary"
           size="small"
           @click="handleReset"
-          >重置
+        >重置
         </el-button>
       </div>
     </div>
@@ -701,20 +811,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>
@@ -756,20 +866,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>
@@ -799,20 +909,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>
@@ -852,10 +962,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="申请退押金备注
@@ -863,8 +971,7 @@
               prop="applyNote"
               min-width="160"
               show-overflow-tooltip
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="left"
               label="验收说明
@@ -872,8 +979,7 @@
               prop="checkNote"
               min-width="160"
               show-overflow-tooltip
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="left"
               label="是否退押
@@ -893,10 +999,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>
@@ -953,14 +1057,14 @@ export default {
       original: []
     }
   },
-  created() {
-    this.getDetail()
-  },
   computed: {
     isCustomer() {
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     }
   },
+  created() {
+    this.getDetail()
+  },
   methods: {
     getDetail() {
       if (this.engineering == '工程押金信息') {
@@ -970,7 +1074,7 @@ export default {
           } else {
             this.isDis = false
           }
-          let arr = []
+          const arr = []
           res.data.items.forEach(item => {
             if (Number(item.qty) > 0) {
               arr.push(item)
@@ -979,6 +1083,12 @@ export default {
             item.sums1 = ['orderHasSendQty', 'dataQty', 'qty', 'hasSendQty', 'contractQty']
             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']
+          })
           res.data.items = arr
           this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
           this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')

+ 106 - 0
src/views/deposit_home/components/deposit_replenish.vue

@@ -394,6 +394,106 @@
           </el-table>
         </div>
       </div>
+      <h3>押金货品信息</h3>
+      <el-divider />
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="details.collectList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="left" label="工程登录单号" prop="refEnginRecordNo" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <span>{{ scope.row.refEnginRecordNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="基本单位编码" prop="unit" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.unit" />
+                <span>{{ scope.row.unit }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletName" />
+                <span>{{ scope.row.customerWalletName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包编码" prop="customerWalletNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletNumber" />
+                <span>{{ scope.row.customerWalletNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型名称" prop="k3CategoryName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryName" />
+                <span>{{ scope.row.k3CategoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型编码" prop="k3CategoryNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryNumber" />
+                <span>{{ scope.row.k3CategoryNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料名称" prop="materialName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialName" />
+                <span>{{ scope.row.materialName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialNumber" />
+                <span>{{ scope.row.materialNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料旧编码" prop="materialOldNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
+                <span>{{ scope.row.materialOldNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </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">
+                {{ scope.row.price | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="已退押金金额" prop="refundDepositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.refundDepositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
       <h3 class="gdzl">工程资料</h3>
       <el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"
         >批量下载
@@ -1018,6 +1118,12 @@ export default {
             item.sums1 = ['orderHasSendQty', 'dataQty', 'qty', 'hasSendQty', 'contractQty']
             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']
+})
           res.data.items = arr
           this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
           this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')

+ 106 - 1
src/views/deposit_home/components/refund_list-detail.vue

@@ -588,7 +588,106 @@
         </div>
       </div>
     </div>
-
+    <h3>押金货品信息</h3>
+      <el-divider />
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="detailList.collectList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="left" label="工程登录单号" prop="refEnginRecordNo" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <span>{{ scope.row.refEnginRecordNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="基本单位编码" prop="unit" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.unit" />
+                <span>{{ scope.row.unit }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletName" />
+                <span>{{ scope.row.customerWalletName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包编码" prop="customerWalletNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletNumber" />
+                <span>{{ scope.row.customerWalletNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型名称" prop="k3CategoryName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryName" />
+                <span>{{ scope.row.k3CategoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型编码" prop="k3CategoryNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryNumber" />
+                <span>{{ scope.row.k3CategoryNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料名称" prop="materialName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialName" />
+                <span>{{ scope.row.materialName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialNumber" />
+                <span>{{ scope.row.materialNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料旧编码" prop="materialOldNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
+                <span>{{ scope.row.materialOldNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </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">
+                {{ scope.row.price | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="已退押金金额" prop="refundDepositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.refundDepositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
     <h3 class="gdzl">工程资料</h3>
     <!--    <el-button :readonly="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"-->
     <!--      >批量下载</el-button-->
@@ -1295,6 +1394,12 @@ export default {
           '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']
+})
       res.data.items = arr
       this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
       this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')

+ 106 - 1
src/views/deposit_home/components/refund_reexamine.vue

@@ -588,7 +588,106 @@
         </div>
       </div>
     </div>
-
+    <h3>押金货品信息</h3>
+      <el-divider />
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="detailList.collectList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="left" label="工程登录单号" prop="refEnginRecordNo" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <span>{{ scope.row.refEnginRecordNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="基本单位编码" prop="unit" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.unit" />
+                <span>{{ scope.row.unit }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletName" />
+                <span>{{ scope.row.customerWalletName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包编码" prop="customerWalletNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletNumber" />
+                <span>{{ scope.row.customerWalletNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型名称" prop="k3CategoryName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryName" />
+                <span>{{ scope.row.k3CategoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型编码" prop="k3CategoryNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryNumber" />
+                <span>{{ scope.row.k3CategoryNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料名称" prop="materialName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialName" />
+                <span>{{ scope.row.materialName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialNumber" />
+                <span>{{ scope.row.materialNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料旧编码" prop="materialOldNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
+                <span>{{ scope.row.materialOldNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </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">
+                {{ scope.row.price | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="已退押金金额" prop="refundDepositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.refundDepositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
     <h3 class="gdzl">工程资料</h3>
     <!--    <el-button :readonly="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"-->
     <!--      >批量下载</el-button-->
@@ -1098,6 +1197,12 @@ export default {
           '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']
+})
       res.data.items = arr
       this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
       this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')

+ 106 - 1
src/views/deposit_home/components/refund_replenish.vue

@@ -588,7 +588,106 @@
         </div>
       </div>
     </div>
-
+    <h3>押金货品信息</h3>
+      <el-divider />
+      <!-- 列表 -->
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="detailList.collectList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="left" label="工程登录单号" prop="refEnginRecordNo" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <span>{{ scope.row.refEnginRecordNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="基本单位编码" prop="unit" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.unit" />
+                <span>{{ scope.row.unit }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletName" />
+                <span>{{ scope.row.customerWalletName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="现金钱包编码" prop="customerWalletNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerWalletNumber" />
+                <span>{{ scope.row.customerWalletNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型名称" prop="k3CategoryName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryName" />
+                <span>{{ scope.row.k3CategoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料类型编码" prop="k3CategoryNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.k3CategoryNumber" />
+                <span>{{ scope.row.k3CategoryNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料名称" prop="materialName" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialName" />
+                <span>{{ scope.row.materialName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialNumber" />
+                <span>{{ scope.row.materialNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="金蝶物料旧编码" prop="materialOldNumber" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
+                <span>{{ scope.row.materialOldNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </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">
+                {{ scope.row.price | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="已退押金金额" prop="refundDepositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.refundDepositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="押金金额" prop="depositAmount" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
     <h3 class="gdzl">工程资料</h3>
     <!--    <el-button :readonly="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"-->
     <!--      >批量下载</el-button-->
@@ -1339,6 +1438,12 @@ export default {
           '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']
+})
       res.data.items = arr
       this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
       this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')