Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue

@@ -155,7 +155,8 @@ export default {
           modelSid: element.modelSid,
           configName: element.configName,
           configSid: element.configSid,
-          guidedPrice: element.guidedPrice
+          guidedPrice: element.guidedPrice,
+          manufactorSettlementPrice: element.manufactorSettlementPrice
         })
       })
       this.sids = aa

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue

@@ -62,11 +62,16 @@
 <!--                <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="现销售指导价(元)" header-align="center" width="150">
+            <el-table-column label="现全款销售指导价(元)" header-align="center" width="190">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="现贷款销售指导价(元)" header-align="center" width="190">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="价格增减数额(元)" header-align="center" width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
@@ -194,6 +199,7 @@ export default {
             costPrice: '',
             guidedPrice: e.guidedPrice,
             incOrDecInPrice: '',
+            manufactorSettlementPrice: e.manufactorSettlementPrice,
             remarks: ''
           })
         })

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue

@@ -51,11 +51,16 @@
 <!--                <span>{{ scope.row.costPrice }}</span>-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="现销售指导价(元)" align="center" width="150">
+            <el-table-column label="现全款销售指导价(元)" align="center" width="190">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="现贷款销售指导价(元)" align="center" width="190">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="价格增减数额(元)" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.incOrDecInPrice }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue

@@ -155,7 +155,8 @@ export default {
           modelSid: element.modelSid,
           configName: element.configName,
           configSid: element.configSid,
-          guidedPrice: element.guidedPrice
+          guidedPrice: element.guidedPrice,
+          manufactorSettlementPrice: element.manufactorSettlementPrice
         })
       })
       this.sids = aa

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue

@@ -51,11 +51,16 @@
 <!--                <span>{{ scope.row.costPrice }}</span>-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="现销售指导价(元)" align="center" width="150">
+            <el-table-column label="现全款销售指导价(元)" align="center" width="190">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="现贷款销售指导价(元)" align="center" width="190">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="价格增减数额(元)" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.incOrDecInPrice }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue

@@ -61,11 +61,16 @@
 <!--                <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="现销售指导价(元)" header-align="center" width="150">
+            <el-table-column label="现全款销售指导价(元)" header-align="center" width="190">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="现贷款销售指导价(元)" align="center" width="190">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="价格增减数额(元)" header-align="center" width="200">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
@@ -193,6 +198,7 @@ export default {
             costPrice: '',
             guidedPrice: e.guidedPrice,
             incOrDecInPrice: '',
+            manufactorSettlementPrice: e.manufactorSettlementPrice,
             remarks: ''
           })
         })

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue

@@ -49,11 +49,16 @@
 <!--                <span>{{ scope.row.costPrice }}</span>-->
 <!--              </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="现销售指导价(元)" align="center" width="150">
+            <el-table-column label="现全款销售指导价(元)" align="center" width="190">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="现贷款销售指导价(元)" align="center" width="190">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manufactorSettlementPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="价格增减数额(元)" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.incOrDecInPrice }}</span>