Browse Source

备件申购,多个价格换行显示

duanxiaoduan 1 năm trước cách đây
mục cha
commit
e79f150463
2 tập tin đã thay đổi với 22 bổ sung3 xóa
  1. 0 0
      dist/index.html
  2. 22 3
      src/views/custom/subscribe/index.vue

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/index.html


+ 22 - 3
src/views/custom/subscribe/index.vue

@@ -309,6 +309,8 @@
           <el-table-column v-else label="价格" prop="price" align="center" min-width="60">
             <template slot-scope="scope">
               <span v-if="createTemp.providerId == ''">{{ scope.row.price }}</span>
+              <!-- 修改后 -->
+              <!-- <div v-if="createTemp.providerId == ''" v-for="item in scope.row.price" style="white-space: nowrap;">{{item}}</div> -->
               <el-form v-else :model="scope.row" :rules="rules">
                 <el-form-item prop="price">
                   <el-input v-model="scope.row.price" style="margin-top:15px" />
@@ -316,6 +318,8 @@
               </el-form>
             </template>
           </el-table-column>
+          <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
+          <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" />
           <el-table-column label="申购数量" min-width="120px" align="center" valign="middle">
             <template slot-scope="scope">
               <el-form :model="scope.row" :rules="rules">
@@ -330,8 +334,6 @@
               <el-input v-model="scope.row.purpose" />
             </template>
           </el-table-column>
-          <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
-          <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" />
           <el-table-column
             label="操作"
             align="center"
@@ -474,6 +476,12 @@
           </el-table-column>
           <el-table-column label="现有库存" sortable prop="storageAmount" align="center" min-width="60" />
           <el-table-column label="价格" sortable prop="price" align="center" min-width="60" />
+          <!-- 修改后 -->
+          <!-- <el-table-column label="价格" prop="price" align="center" min-width="60">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.price" style="white-space: nowrap;">{{item}}</div>
+            </template>
+          </el-table-column> -->
           <el-table-column label="申购数量" sortable prop="amount" align="center" min-width="60" />
           <!-- <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
           <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" /> -->
@@ -1162,6 +1170,8 @@ export default {
               this.$nextTick(() => {
                 console.log('新增根据编号获取备件库存数量', response.data.list[0])
                 item = response.data.list[0]
+                console.log('item==>1',item.price)
+                // var price = item.price.split(",")
                 if (item.srcpath !== null && item.picpath !== null && item.srcpath !== undefined && item.picpath !== undefined) {
                   this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
                   this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)
@@ -1169,6 +1179,7 @@ export default {
                   item.srcpath = ''
                   item.picpath = ''
                 }
+                // this.$set(item, 'price', price)
                 this.$set(item, 'amount', '')
                 this.$set(item, 'purpose', '')
                 if(this.dialogStatus==='special' && this.createTemp.purchaseType == '2'){
@@ -1188,6 +1199,7 @@ export default {
             this.$nextTick(() => {
               console.log('新增根据编号获取备件库存数量', response.data.list[0])
               item = response.data.list[0]
+              // var price = item.price.split(",")
               if (item.srcpath !== null && item.picpath !== null && item.srcpath !== undefined && item.picpath !== undefined) {
                 this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
                 this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)
@@ -1195,6 +1207,7 @@ export default {
                 item.srcpath = ''
                 item.picpath = ''
               }
+              // this.$set(item, 'price', price)
               this.$set(item, 'amount', '')
               this.$set(item, 'purpose', '')
               if(this.dialogStatus==='special' && this.createTemp.purchaseType == '2'){
@@ -1537,6 +1550,9 @@ export default {
           this.listAdd = response.data.list
           var sumPrices = 0
           response.data.list.forEach(function(i,j){
+            console.log(i.providerId,'======')
+            console.log(i.purchaseType)
+            // createTemp.providerId,createTemp.purchaseType == '1'
             sumPrices = sumPrices + (parseFloat(i.price1) *parseFloat(i.amount) )
           })
           console.log("总价sumPrices",sumPrices)
@@ -1564,12 +1580,14 @@ export default {
             this.isApplyEx4 = false
             this.getFlowPath()
           }
-
+          // var price = ''
           for (let i = 0; i < response.data.list.length; i++) {
             if (response.data.list[i].srcpath !== null && response.data.list[i].picpath !== null && response.data.list[i].srcpath !== undefined && response.data.list[i].picpath !== undefined) {
               console.log(process.env.VUE_APP_BASE_API + response.data.list[i].srcpath, '=======1')
               this.listSee[i].srcpath = process.env.VUE_APP_BASE_API + response.data.list[i].srcpath
               this.listSee[i].picpath = process.env.VUE_APP_BASE_API + response.data.list[i].picpath
+              // price = response.data.list[i].price.split(",")
+              // this.$set(this.listSee[i], 'price', price)
               this.listAdd[i].srcpath = this.listSee[i].srcpath
               this.listAdd[i].picpath = this.listSee[i].picpath
               // this.seeTemp.providerName = response.data.list.providerName
@@ -1583,6 +1601,7 @@ export default {
             }
           }
         }
+        console.log(this.listSee,'this.listSee')
         if (response.data.total) {
           this.totalSee = response.data.total
         }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác