更新了合同差异项跟备件显示差异项

.env.development

@@ -6,9 +6,9 @@ ENV = 'development'
 # 线上正式地址
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
+VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 

src/views/custom/contractManagement/index.vue

@@ -136,7 +136,8 @@
             <el-table-column label="计量单位" min-width="120px" align="center" prop="unit" />
             <el-table-column label="计划量" sortable min-width="120px" align="center" prop="planAmount" />
             <el-table-column label="单价" sortable min-width="120px" align="center" prop="price" />
-            <el-table-column label="备注" min-width="120px" align="center" prop="remark" />
+            <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
+            <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" />
           </el-table>
           <pagination v-show="tab1.detailsSpareParts.total>0" :total="tab1.detailsSpareParts.total" :page.sync="tab1.detailsSpareParts.getdataListParm.offset" :limit.sync="tab1.detailsSpareParts.getdataListParm.pagecount" @pagination="getTab1List2" />
         </div>
@@ -535,16 +536,16 @@
               <el-input v-model="scope.row.price" />
             </template>
           </el-table-column>
-          <el-table-column label="税码" min-width="80px" align="center" valign="middle">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.taxcode" />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" min-width="110px" align="center">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.remark" type="textarea" placeholder="备注" autosize maxlength="100" show-word-limit />
-            </template>
-          </el-table-column>
+          <el-table-column label="使用周期" min-width="110px" align="center" valign="middle">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.lifeCycle" />
+              </template>
+            </el-table-column>
+            <el-table-column label="合同差异项" min-width="110px" align="center" valign="middle">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.contractVarianceItem" />
+              </template>
+            </el-table-column>
           <el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
               <a class="del" :disabled="isokDisable" @click="partDelete(row)">删除</a>
@@ -2198,7 +2199,9 @@ export default {
           remark: '@insertSpotList.remark',
           unit: '@insertSpotList.unit',
           contractId: '@insertSpotList.contractId',
-          taxcode: '@insertSpotList.taxcode'
+          taxcode: '@insertSpotList.taxcode',
+          lifeCycle: '@insertSpotList.lifeCycle',
+          contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -2287,7 +2290,9 @@ export default {
           remark: '@insertSpotList.remark',
           unit: '@insertSpotList.unit',
           contractId: '@insertSpotList.contractId',
-          taxcode: '@insertSpotList.taxcode'
+          taxcode: '@insertSpotList.taxcode',
+          lifeCycle: '@insertSpotList.lifeCycle',
+          contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -2584,7 +2589,9 @@ export default {
               remark: '@insertSpotList.remark',
               unit: '@insertSpotList.unit',
               contractId: '@insertSpotList.contractId',
-              taxcode: '@insertSpotList.taxcode'
+              taxcode: '@insertSpotList.taxcode',
+              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' }}
@@ -2603,6 +2610,8 @@ export default {
               remark: '@insertSpotList.remark',
               unit: '@insertSpotList.unit',
               contractId: '@insertSpotList.contractId',
+              lifeCycle: '@insertSpotList.lifeCycle',
+              contractVarianceItem: '@insertSpotList.contractVarianceItem',
               // taxcode: '@insertSpotList.taxcode'
             }}
           }

src/views/custom/subscribe/index.vue

@@ -330,6 +330,8 @@
               <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"
@@ -473,11 +475,9 @@
           <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="申购数量" sortable prop="amount" align="center" min-width="60" />
-          <el-table-column label="备注" min-width="110px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.purpose }}</span>
-            </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="110px" align="center" prop="purpose" />
         </el-table>
         <el-form
           ref="seeTemp"