Browse Source

fix: 押金更改字段

zh 2 năm trước cách đây
mục cha
commit
d28087dfe8

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

@@ -276,14 +276,14 @@
           <el-table-column
             align="left"
             label="实装厂产品编码"
-            prop="depositMaterial0ldNumber"
+            prop="depositMaterialOldNumber"
             min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.depositMaterial0ldNumber"
-                :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
+                v-model="scope.row.depositMaterialOldNumber"
+                :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
                 size="mini"
                 readonly
                 @click.native="getRealMaterData(scope.$index)"
@@ -914,7 +914,7 @@ export default {
       getRetailProductList({
         pageNum: this.currentPage,
         pageSize: 10,
-        saleId: '',
+        saleId: this.details.saleTypeId,
         billType: 'HOME',
         materialCode: this.goodsScreenForm.proNum,
         materialName: this.goodsScreenForm.proName,
@@ -943,7 +943,7 @@ export default {
       this.$set(this.details.items[this.currentId], 'depositMaterialId', currentData.materialId)
       this.$set(this.details.items[this.currentId], 'depositMaterialName', currentData.materialName)
       this.$set(this.details.items[this.currentId], 'depositMaterialNumber', currentData.materialNumber)
-      this.$set(this.details.items[this.currentId], 'depositMaterial0ldNumber', currentData.materialOldNumber)
+      this.$set(this.details.items[this.currentId], 'depositMaterialOldNumber', currentData.materialOldNumber)
       this.$set(this.details.items[this.currentId], 'depositSpecification', currentData.specification)
       this.isSetMaterial = false
     },

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

@@ -358,13 +358,13 @@
             <el-table-column
               align="left"
               label="实装厂产品编码"
-              prop="depositMaterial0ldNumber"
+              prop="depositMaterialOldNumber"
               min-width="200"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
-                  {{ scope.row.depositMaterial0ldNumber }}
+                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
+                  {{ scope.row.depositMaterialOldNumber }}
                 </div>
               </template>
             </el-table-column>

+ 3 - 3
src/views/deposit_home/components/deposit_replenish.vue

@@ -356,13 +356,13 @@
             <el-table-column
               align="left"
               label="实装厂产品编码"
-              prop="depositMaterial0ldNumber"
+              prop="depositMaterialOldNumber"
               min-width="200"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
-                  {{ scope.row.depositMaterial0ldNumber }}
+                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
+                  {{ scope.row.depositMaterialOldNumber }}
                 </div>
               </template>
             </el-table-column>

+ 7 - 7
src/views/deposit_home/components/refund_list-detail.vue

@@ -487,21 +487,21 @@
             <el-table-column
               align="left"
               label="实装厂产品编码"
-              prop="depositMaterial0ldNumber"
+              prop="depositMaterialOldNumber"
               min-width="200"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <div
                   v-if="title=='详情'"
-                  :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
+                  :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
                 >
-                  {{ scope.row.depositMaterial0ldNumber }}
+                  {{ scope.row.depositMaterialOldNumber }}
                 </div>
                 <el-input
                   v-else
-                  v-model="scope.row.depositMaterial0ldNumber"
-                  :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
+                  v-model="scope.row.depositMaterialOldNumber"
+                  :class="scope.row.realMaterialOldNumber != scope.row.materialOldNumber? 'input' : scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber? 'input2':'' "
                   size="mini"
                   readonly
                   @click.native="getRealMaterData(scope.$index)"
@@ -1598,7 +1598,7 @@ export default {
       getRetailProductList({
         pageNum: this.currentPage,
         pageSize: 10,
-        saleId: '',
+        saleId: this.detailList.saleTypeId,
         billType: 'HOME',
         materialCode: this.goodsScreenForm.proNum,
         materialName: this.goodsScreenForm.proName,
@@ -1627,7 +1627,7 @@ export default {
       this.$set(this.detailList.items[this.currentId], 'depositMaterialId', currentData.materialId)
       this.$set(this.detailList.items[this.currentId], 'depositMaterialName', currentData.materialName)
       this.$set(this.detailList.items[this.currentId], 'depositMaterialNumber', currentData.materialNumber)
-      this.$set(this.detailList.items[this.currentId], 'depositMaterial0ldNumber', currentData.materialOldNumber)
+      this.$set(this.detailList.items[this.currentId], 'depositMaterialOldNumber', currentData.materialOldNumber)
       this.$set(this.detailList.items[this.currentId], 'depositSpecification', currentData.specification)
       this.isSetMaterial = false
     },

+ 3 - 3
src/views/deposit_home/components/refund_reexamine.vue

@@ -487,13 +487,13 @@
             <el-table-column
               align="left"
               label="实装厂产品编码"
-              prop="depositMaterial0ldNumber"
+              prop="depositMaterialOldNumber"
               min-width="200"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
-                  {{ scope.row.depositMaterial0ldNumber }}
+                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
+                  {{ scope.row.depositMaterialOldNumber }}
                 </div>
               </template>
             </el-table-column>

+ 3 - 3
src/views/deposit_home/components/refund_replenish.vue

@@ -487,13 +487,13 @@
             <el-table-column
               align="left"
               label="实装厂产品编码"
-              prop="depositMaterial0ldNumber"
+              prop="depositMaterialOldNumber"
               min-width="200"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterial0ldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
-                  {{ scope.row.depositMaterial0ldNumber }}
+                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } :scope.row.depositMaterialOldNumber != scope.row.realMaterialOldNumber ? { color: '#f00' }:'' ">
+                  {{ scope.row.depositMaterialOldNumber }}
                 </div>
               </template>
             </el-table-column>