合同管理/备件申购:新增使用周期及合同差异项

src/views/custom/contractManagement/index.vue

@@ -2212,8 +2212,8 @@ export default {
           unit: '@insertSpotList.unit',
           contractId: '@insertSpotList.contractId',
           taxcode: '@insertSpotList.taxcode',
-          // lifeCycle: '@insertSpotList.lifeCycle',
-          // contractVarianceItem: '@insertSpotList.contractVarianceItem',
+          lifeCycle: '@insertSpotList.lifeCycle',
+          contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -2303,8 +2303,8 @@ export default {
           unit: '@insertSpotList.unit',
           contractId: '@insertSpotList.contractId',
           taxcode: '@insertSpotList.taxcode',
-          // lifeCycle: '@insertSpotList.lifeCycle',
-          // contractVarianceItem: '@insertSpotList.contractVarianceItem',
+          lifeCycle: '@insertSpotList.lifeCycle',
+          contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -2602,8 +2602,8 @@ export default {
               unit: '@insertSpotList.unit',
               contractId: '@insertSpotList.contractId',
               taxcode: '@insertSpotList.taxcode',
-              // lifeCycle: '@insertSpotList.lifeCycle',
-              // contractVarianceItem: '@insertSpotList.contractVarianceItem',
+              lifeCycle: '@insertSpotList.lifeCycle',
+              contractVarianceItem: '@insertSpotList.contractVarianceItem',
             }}
           } else {
             this.postDataPramas.data[1].children[0] = { 'name': 'checkcontracPartCode', 'type': 'v', 'parammaps': { pastureId: this.tab1.detailsSpareParts.detailsList.pastureId, providerId: this.tab1.detailsSpareParts.detailsList.providerId, stopTime: this.tab1.detailsSpareParts.detailsList.stopTime, flag: this.tab1.detailsSpareParts.detailsList.flag, isZeroStock: this.tab1.detailsSpareParts.detailsList.isZeroStock, statue: this.tab1.detailsSpareParts.detailsList.statue, partCode: '@insertSpotList.partCode', brandId: '@insertSpotList.brandId' }}
@@ -2622,8 +2622,8 @@ export default {
               remark: '@insertSpotList.remark',
               unit: '@insertSpotList.unit',
               contractId: '@insertSpotList.contractId',
-              // lifeCycle: '@insertSpotList.lifeCycle',
-              // contractVarianceItem: '@insertSpotList.contractVarianceItem',
+              lifeCycle: '@insertSpotList.lifeCycle',
+              contractVarianceItem: '@insertSpotList.contractVarianceItem',
               // taxcode: '@insertSpotList.taxcode'
             }}
           }

src/views/custom/subscribe/index.vue

@@ -264,9 +264,14 @@
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="价格" prop="price" align="center" min-width="60">
+          <el-table-column label="价格" prop="price" align="center" min-width="120">
             <template slot-scope="scope">
-              <span v-if="createTemp.providerId == ''">{{ scope.row.price }}</span>
+              <div v-if="createTemp.providerId == ''" v-for="item in scope.row.pricearr">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </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" />
@@ -274,9 +279,27 @@
               </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">
+          <el-table-column label="使用周期" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.lifeCyclearr">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="合同差异项" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.contractVarianceItemarr">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="申购数量" min-width="100px" align="center" valign="middle">
             <template slot-scope="scope">
               <el-form :model="scope.row" :rules="rules">
                 <el-form-item prop="amount">
@@ -463,9 +486,15 @@
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-if="dialogStatus==='special'" label="价格" prop="price" align="center" min-width="60">
+          <el-table-column v-if="dialogStatus==='special'" label="价格" prop="price" align="center" min-width="120">
             <template slot-scope="scope">
-              <span v-if="createTemp.purchaseType == '1'">{{ scope.row.price }}</span>
+              <div v-if="createTemp.purchaseType == '1'" v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+              <!-- <span v-if="createTemp.purchaseType == '1'">{{ scope.row.price }}</span> -->
               <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" />
@@ -473,9 +502,27 @@
               </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">
+          <el-table-column label="使用周期" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.lifeCyclearr">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="合同差异项" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.contractVarianceItemarr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="申购数量" min-width="100px" align="center" valign="middle">
             <template slot-scope="scope">
               <el-form :model="scope.row" :rules="rules">
                 <el-form-item prop="amount">
@@ -629,9 +676,37 @@
             </template>
           </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="使用周期" min-width="120px" align="center" prop="lifeCycle" />
-          <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" />
+          <!-- <el-table-column label="价格" sortable prop="price" align="center" min-width="60" /> -->
+          <el-table-column label="价格" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="使用周期" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.lifeCyclearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="合同差异项" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.contractVarianceItemarr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column label="申购数量" sortable prop="amount" align="center" min-width="60" />
           <el-table-column label="备注" min-width="110px" align="center" prop="purpose" />
         </el-table>
@@ -1334,6 +1409,12 @@ export default {
                   this.$set(item,'price','0')
                   this.$set(item,'amount','0')
                 }
+                var pricearr = item.price.split(",")
+                this.$set(item,'pricearr',pricearr)
+                var lifeCyclearr = item.lifeCycle.split(",")
+                this.$set(item,'lifeCyclearr',lifeCyclearr)
+                var contractVarianceItemarr = item.contractVarianceItem.split(",")
+                this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
                 this.listAdd.unshift(item)
                 this.$forceUpdate()
               })
@@ -1360,6 +1441,12 @@ export default {
                 this.$set(item,'price','0')
                 this.$set(item,'amount','0')
               }
+              var pricearr = item.price.split(",")
+              this.$set(item,'pricearr',pricearr)
+              var lifeCyclearr = item.lifeCycle.split(",")
+              this.$set(item,'lifeCyclearr',lifeCyclearr)
+              var contractVarianceItemarr = item.contractVarianceItem.split(",")
+              this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
               this.listAdd.unshift(item)
               this.$forceUpdate()
             })
@@ -1384,6 +1471,12 @@ export default {
               this.$set(item,'price','0')
               this.$set(item,'amount','0')
             }
+            var pricearr = item.price.split(",")
+            this.$set(item,'pricearr',pricearr)
+            var lifeCyclearr = item.lifeCycle.split(",")
+            this.$set(item,'lifeCyclearr',lifeCyclearr)
+            var contractVarianceItemarr = item.contractVarianceItem.split(",")
+            this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
             this.listAdd.unshift(item)
           }
         } else {
@@ -1400,6 +1493,12 @@ export default {
             this.$set(item,'price','0')
             this.$set(item,'amount','0')
           }
+          var pricearr = item.price.split(",")
+          this.$set(item,'pricearr',pricearr)
+          var lifeCyclearr = item.lifeCycle.split(",")
+          this.$set(item,'lifeCyclearr',lifeCyclearr)
+          var contractVarianceItemarr = item.contractVarianceItem.split(",")
+          this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
           this.listAdd.unshift(item)
           this.$forceUpdate()
         }
@@ -1490,7 +1589,9 @@ export default {
           purpose: '@insertSpotList.purpose',
           amount: '@insertSpotList.amount',
           price: '@insertSpotList.price',
-          contractId: '@insertSpotList.contractId'
+          contractId: '@insertSpotList.contractId',
+          lifeCycle: '@insertSpotList.lifeCycle',
+          contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -1690,6 +1791,15 @@ export default {
       GetDataByName(this.getdataListSee).then(response => {
         if (response.data.list !== null) {
           console.log('查看下方table数据', response.data.list)
+          response.data.list.forEach((item)=>{
+            console.log(item,'item')
+            var pricearr = item.price.split(",")
+            this.$set(item,'pricearr',pricearr)
+            var lifeCyclearr = item.lifeCycle.split(",")
+            this.$set(item,'lifeCyclearr',lifeCyclearr)
+            var contractVarianceItemarr = item.contractVarianceItem.split(",")
+            this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
+          })
           this.listSee = response.data.list
           this.listAdd = response.data.list
           var sumPrices = 0
@@ -1834,7 +1944,9 @@ export default {
           purpose: '@insertSpotList.purpose',
           amount: '@insertSpotList.amount',
           price: '@insertSpotList.price',
-          contractId: '@insertSpotList.contractId'
+          contractId: '@insertSpotList.contractId',
+          lifeCycle: '@insertSpotList.lifeCycle',
+          contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)