Finish Hotfix-zh-90

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

@@ -75,7 +75,7 @@
               <div class="label">工程差价总额</div>
               <div class="value">{{ details.depositDiffAmount }}</div>
             </el-col>
-              <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
+                 <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
               <div class="label">格力备注</div>
               <div class="value">{{ details.geLiInerNote }}</div>
             </el-col>
@@ -206,7 +206,11 @@
               prop="price"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="数量"
@@ -220,7 +224,11 @@
               prop="totalAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="发货数量"
@@ -234,7 +242,11 @@
               prop="depositAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="上交资料"
@@ -248,7 +260,11 @@
               prop="diffAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed}}
+            </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -513,7 +529,11 @@
               prop="price"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+            <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="数量"
@@ -527,7 +547,11 @@
               prop="totalDepositAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+            <template slot-scope="scope">
+                {{ scope.row.totalDepositAmount | numToFixed}}
+            </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -596,7 +620,12 @@
               prop="price"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+
+            </el-table-column>
             <el-table-column
               align="right"
               label="数量"
@@ -614,7 +643,7 @@
               <template slot-scope="scope">
                 {{
                   (scope.row.refundableQty || 0) *
-                  (scope.row.singleDepositAmount || 0)
+                  (scope.row.singleDepositAmount || 0)  | numToFixed
                 }}
               </template>
             </el-table-column>
@@ -681,7 +710,11 @@
             prop="price"
             min-width="160"
             show-overflow-tooltip
-          />
+          >
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+          </el-table-column>
           <el-table-column
             align="right"
             label="数量"
@@ -699,7 +732,7 @@
             <template slot-scope="scope">
               {{
                 (scope.row.qty || 0) *
-                (scope.row.singleDepositAmount || 0)
+                (scope.row.singleDepositAmount || 0) | numToFixed
               }}
             </template>
           </el-table-column>
@@ -752,17 +785,17 @@ export default {
       }
     }
   },
-    computed:{
+  created() {
+    this.getDetail()
+  },
+  computed:{
     isCustomer(){
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     }
   },
-  created() {
-    this.getDetail()
-  },
-
   methods: {
     getDetail() {
+
       if (this.engineering == '工程押金信息') {
         geDetail({ id: this.$parent.depositManageId }).then((res) => {
           this.details = res.data

src/views/deposit_commerce/deposit_list.vue

@@ -355,13 +355,13 @@
               min-width="160"
               show-overflow-tooltip
             />
-            <!-- <el-table-column
+            <el-table-column
               align="left"
-              label="是否已发货"
-              prop=""
+              label="资料审核日期"
+              prop="refDatumAcceptDate"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column> -->
+            ></el-table-column>
             <el-table-column
               align="center"
               label="操作"

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

@@ -206,7 +206,11 @@
               prop="price"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="数量"
@@ -220,7 +224,11 @@
               prop="totalAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="发货数量"
@@ -234,7 +242,11 @@
               prop="depositAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="上交资料"
@@ -248,7 +260,11 @@
               prop="diffAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed}}
+            </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -513,7 +529,11 @@
               prop="price"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+            <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+            </el-table-column>
             <el-table-column
               align="right"
               label="数量"
@@ -527,7 +547,11 @@
               prop="totalDepositAmount"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+            <template slot-scope="scope">
+                {{ scope.row.totalDepositAmount | numToFixed}}
+            </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -596,7 +620,12 @@
               prop="price"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+             <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+
+            </el-table-column>
             <el-table-column
               align="right"
               label="数量"
@@ -614,7 +643,7 @@
               <template slot-scope="scope">
                 {{
                   (scope.row.refundableQty || 0) *
-                  (scope.row.singleDepositAmount || 0)
+                  (scope.row.singleDepositAmount || 0)  | numToFixed
                 }}
               </template>
             </el-table-column>
@@ -681,7 +710,11 @@
             prop="price"
             min-width="160"
             show-overflow-tooltip
-          />
+          >
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
+            </template>
+          </el-table-column>
           <el-table-column
             align="right"
             label="数量"
@@ -699,7 +732,7 @@
             <template slot-scope="scope">
               {{
                 (scope.row.qty || 0) *
-                (scope.row.singleDepositAmount || 0)
+                (scope.row.singleDepositAmount || 0) | numToFixed
               }}
             </template>
           </el-table-column>

src/views/deposit_home/deposit_list.vue

@@ -355,13 +355,13 @@
               min-width="160"
               show-overflow-tooltip
             />
-            <!-- <el-table-column
+              <el-table-column
               align="left"
-              label="是否已发货"
-              prop=""
+              label="资料审核日期"
+              prop="refDatumAcceptDate"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column> -->
+            ></el-table-column>
             <el-table-column
               align="center"
               label="操作"

src/views/sales_policy/components/AddPolicy.vue

@@ -169,7 +169,7 @@
               min-width="150"
             >
               <template slot-scope="scope">
-
+ <CopyButton :copyText="scope.row.materialNumber" />
 
                 <el-select
                   v-model="scope.row.materialNumber"
@@ -178,9 +178,10 @@
                   :remote-method="(query) => remoteMethod(query, 'number')"
                   filterable
                   remote
+                   style="width: 85%;"
                   @change="handleK3List($event, scope.row)"
                 >
-                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
+
                   <el-option
                     v-for="(item, index) in k3List"
                     :key="index"
@@ -211,6 +212,8 @@
             >
               <template slot-scope="scope">
 
+             <CopyButton :copyText="scope.row.specification" />
+
                 <el-select
                   v-model="scope.row.specification"
                   size="mini"
@@ -218,10 +221,11 @@
                     (query) => remoteMethod(query, 'specification')
                   "
                   filterable
+                   style="width: 85%;"
                   remote
                   @change="handleK3List($event, scope.row)"
                 >
-                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
+
                   <el-option
                     v-for="(item, index) in k3List"
                     :key="index"

src/views/sales_policy/components/Examine.vue

@@ -864,7 +864,7 @@ export default {
 getPolicyList() {
       this.clistLoading = true;
       getPolicyList({
-        pageNum: this.policyList.pageNum,
+        pageNum: this.policyList.currentPages,
         pageSize: this.policyList.pageSize,
         policyId: this.$parent.id,
         keyword: this.policyList.keyword,

src/views/sales_policy/components/TabelTransfer.vue

@@ -411,7 +411,7 @@ export default {
     getPolicyList() {
       this.clistLoading = true;
       getPolicyList({
-        pageNum: this.policyList.pageNum,
+        pageNum: this.policyList.currentPages,
         pageSize: this.policyList.pageSize,
         policyId: this.comCode || this.code,
         keyword: this.keyword2,

src/views/sales_policy/components/details.vue

@@ -892,7 +892,7 @@ export default {
 getPolicyList() {
       this.clistLoading = true;
       getPolicyList({
-        pageNum: this.policyList.pageNum,
+        pageNum: this.policyList.currentPages,
         pageSize: this.policyList.pageSize,
         policyId: this.$parent.id,
         keyword: this.policyList.keyword,

src/views/sales_policy/components/editPolicy.vue

@@ -160,7 +160,7 @@
               align="left"
             >
               <template slot-scope="scope">
-
+      <CopyButton :copyText="scope.row.materialNumber" />
                 <el-select
                   v-model="scope.row.materialNumber"
                   v-el-select-loadmore="loadmore"
@@ -168,9 +168,10 @@
                   :remote-method="(query)=>remoteMethod(query,'number')"
                   filterable
                   remote
+                   style="width: 85%;"
                   @change="handleK3List($event, scope.row)"
                 >
-                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
+
                   <el-option
                     v-for="item in k3List"
                     :key="item.id"
@@ -200,17 +201,18 @@
               label="规格型号"
               align="left"
             >
-              <template slot-scope="scope">
-
+              <template slot-scope="scope" >
+             <CopyButton :copyText="scope.row.specification" />
                 <el-select
                   v-model="scope.row.specification"
                   size="mini"
                   :remote-method="(query)=>remoteMethod(query,'specification')"
                   filterable
                   remote
+                  style="width: 85%;"
                   @change="handleK3List($event, scope.row)"
                 >
-                  <template #prefix>        <CopyButton :copyText="scope.row.materialNumber" /></template>
+
                   <el-option
                     v-for="item in k3List"
                     :key="item.id"