Browse Source

修改了备件申购

duanxiaoduan 1 year ago
parent
commit
b35bb5e1a7
2 changed files with 58 additions and 38 deletions
  1. 0 0
      dist/index.html
  2. 58 38
      src/views/custom/subscribe/index.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 58 - 38
src/views/custom/subscribe/index.vue

@@ -486,23 +486,26 @@
               <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="150">
-            <template slot-scope="scope">
-              <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" />
-                </el-form-item>
-              </el-form>
-            </template>
+          <el-table-column  v-if="createTemp.purchaseType == '1'" label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <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>
+            </template>
+          </el-table-column>
+          <el-table-column  v-if="createTemp.purchaseType == '3'" label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <el-form :model="scope.row" :rules="rules">
+                <el-form-item prop="price">
+                  <el-input v-model="scope.row.price" style="margin-top:15px"  />
+                </el-form-item>
+              </el-form>
+            </template>
           </el-table-column>
-          <el-table-column label="使用周期" min-width="120px" align="center">
+          <el-table-column v-if="createTemp.purchaseType == '1'" 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">
@@ -512,7 +515,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="合同差异项" min-width="120px" align="center">
+          <el-table-column v-if="createTemp.purchaseType == '1'" 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">
@@ -1408,14 +1411,16 @@ export default {
                 }else if(this.dialogStatus==='special' && this.createTemp.purchaseType == '3'){
                   this.$set(item,'price','0')
                   this.$set(item,'amount','0')
-                }
-                var pricearr = item.price.split(",")
-                this.$set(item,'pricearr',pricearr)
-                if(this.dialogStatus !=='special'){
+                }
+                if(item.price){
                   var pricearr = item.price.split(",")
                   this.$set(item,'pricearr',pricearr)
+                }
+                if(item.lifeCycle){
                   var lifeCyclearr = item.lifeCycle.split(",")
                   this.$set(item,'lifeCyclearr',lifeCyclearr)
+                }
+                if(item.contractVarianceItem){
                   var contractVarianceItemarr = item.contractVarianceItem.split(",")
                   this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
                 }
@@ -1445,14 +1450,19 @@ export default {
                 this.$set(item,'price','0')
                 this.$set(item,'amount','0')
               }
-              if(this.dialogStatus !=='special'){
+              if(item.price){
                 var pricearr = item.price.split(",")
                 this.$set(item,'pricearr',pricearr)
+              }
+              if(item.lifeCycle){
                 var lifeCyclearr = item.lifeCycle.split(",")
                 this.$set(item,'lifeCyclearr',lifeCyclearr)
+              }
+              if(item.contractVarianceItem){
                 var contractVarianceItemarr = item.contractVarianceItem.split(",")
                 this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
-              }
+              }
+
               this.listAdd.unshift(item)
               this.$forceUpdate()
             })
@@ -1477,14 +1487,18 @@ export default {
               this.$set(item,'price','0')
               this.$set(item,'amount','0')
             }
-            if(this.dialogStatus !=='special'){
-                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)
-              }
+            if(item.price){
+              var pricearr = item.price.split(",")
+              this.$set(item,'pricearr',pricearr)
+            }
+            if(item.lifeCycle){
+              var lifeCyclearr = item.lifeCycle.split(",")
+              this.$set(item,'lifeCyclearr',lifeCyclearr)
+            }
+            if(item.contractVarianceItem){
+              var contractVarianceItemarr = item.contractVarianceItem.split(",")
+              this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
+            }
             this.listAdd.unshift(item)
           }
         } else {
@@ -1501,13 +1515,19 @@ export default {
             this.$set(item,'price','0')
             this.$set(item,'amount','0')
           }
-          if(this.dialogStatus !=='special' && this.createTemp.providerId == ''){
-            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)
+          if(this.createTemp.providerId == ''){
+            if(item.price){
+              var pricearr = item.price.split(",")
+              this.$set(item,'pricearr',pricearr)
+            }
+            if(item.lifeCycle){
+              var lifeCyclearr = item.lifeCycle.split(",")
+              this.$set(item,'lifeCyclearr',lifeCyclearr)
+            }
+            if(item.contractVarianceItem){
+              var contractVarianceItemarr = item.contractVarianceItem.split(",")
+              this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
+            }
           }
           this.listAdd.unshift(item)
           this.$forceUpdate()

Some files were not shown because too many files changed in this diff