Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@@ -177,6 +177,34 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>{{ name }}</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <span>{{ temp.trailerOrInstall }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span><span class="icon">*</span>{{ name }}成交价</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="trailerOrInstallDealPrice">
+              <el-input v-model="temp.trailerOrInstallDealPrice" placeholder="" clearable class="addinputw"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>总成交价</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ totalDealPrice() }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <el-dialog :visible.sync="dialogVisible" width="40%" :close-on-click-modal="false">
@@ -244,6 +272,7 @@ export default {
       },
       dialogVisible: false,
       disabledBtn: false,
+      name: '',
       temp: {
         vinNo: '',
         vinSid: '',
@@ -273,7 +302,10 @@ export default {
         typeKey: '', // 出库类型Key
         createOrgSid: '',
         remarks: '',
-        isUpdateOrInsertCrm: ''
+        isUpdateOrInsertCrm: '',
+        trailerOrInstall: '',
+        trailerOrInstallDealPrice: '',
+        totalDealPrice: ''
       },
       payType_list: [], // 出库类型
       org_list: [], // 销售部门
@@ -289,6 +321,7 @@ export default {
         concatNo: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }],
         isTerminal: [{ required: true, message: '是否为终端客户不能为空', trigger: 'change' }],
         customerName: [{ required: true, message: '客户名称不能为空', trigger: 'change' }],
+        trailerOrInstallDealPrice: [{ required: true, message: '成交价不能为空', trigger: 'change' }]
       }
     }
   },
@@ -370,6 +403,9 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
+      this.name = multipleSelection[0].szOrGC
+      this.temp.trailerOrInstall = multipleSelection[0].trailerOrInstall
+      this.temp.trailerOrInstallDealPrice = multipleSelection[0].trailerOrInstallDealPrice
       this.temp.vinNo = multipleSelection[0].vinNo
       this.temp.vinSid = multipleSelection[0].sid
       this.temp.createOrgSid = createOrgSid
@@ -379,6 +415,14 @@ export default {
       this.temp.salesAllowance = '0'
       this.getType()
     },
+    totalDealPrice() {
+      if (this.temp.trailerOrInstallDealPrice !== '' && this.temp.price !== '') {
+        this.temp.totalDealPrice = parseFloat(this.temp.price) + parseFloat(this.temp.trailerOrInstallDealPrice)
+      } else {
+        this.temp.totalDealPrice = ''
+      }
+      return this.temp.totalDealPrice
+    },
     // 保存
     handleCreate() {
       if (this.temp.giftsDescription !== '' && this.temp.giftsDescription !== '0' && this.temp.remarks === '') {
@@ -465,8 +509,12 @@ export default {
         type: '', // 出库类型
         typeKey: '', // 出库类型Key
         createOrgSid: '',
-        isUpdateOrInsertCrm: ''
+        isUpdateOrInsertCrm: '',
+        trailerOrInstall: '',
+        trailerOrInstallDealPrice: '',
+        totalDealPrice: ''
       }
+      this.name = ''
       this.disabledBtn = false
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue

@@ -68,17 +68,17 @@
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center" width="200">
+            <el-table-column label="分公司" align="center" width="90">
               <template slot-scope="scope">
                 <span>{{ scope.row.createOrgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车架号" align="center" width="120">
+            <el-table-column label="车架号" align="center" width="90">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车型(配置简述)" align="center" width="400">
+            <el-table-column label="车型(配置简述)" align="center" width="130">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span>
               </template>
@@ -88,42 +88,42 @@
                 <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售类型" align="center" width="120">
+            <el-table-column label="销售类型" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.type }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售日期" align="center" width="120">
+            <el-table-column label="销售日期" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.saleDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="成交价(元)" align="center" width="150">
+            <el-table-column label="成交价(元)" align="center" width="110">
               <template slot-scope="scope">
                 <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售部门" align="center" width="180">
+            <el-table-column label="销售部门" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.orgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售专员" align="center" width="150">
+            <el-table-column label="销售专员" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.staffName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合同编号" align="center" width="200">
+            <el-table-column label="合同编号" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.concatNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="是否为终端客户" align="center" width="160">
+            <el-table-column label="是否为终端客户" align="center" width="140">
               <template slot-scope="scope">
                 <span>{{ scope.row.isTerminal }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="客户名称" align="center" width="120">
+            <el-table-column label="客户名称" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.customerName }}</span>
               </template>