Przeglądaj źródła

项目商机、报价单编辑调整、项目阶段管理

qymljy 3 lat temu
rodzic
commit
6f0b86e119

+ 24 - 11
src/Form/QuotedPrice/edit.vue

@@ -4,24 +4,25 @@
     <el-drawer
         title="编辑报价单"
         :visible.sync="drawer"
-        size="70%"
+        size="92%"
         direction="rtl"
+        :show-close="false"
         append-to-body
         @close="onClose">
       <div class="drawer__panel" style="margin-bottom: 0px">
         <el-row style="margin-top: 10px">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
-            <el-col :span="11">
+            <el-col :span="6">
               <el-form-item label="报价类型:" label-width="90px" >
                 <el-input v-model="form.quotedpricetype" autocomplete="off" placeholder="报价类型" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11">
+            <el-col  :span="6">
               <el-form-item label="是否特价:" label-width="90px" >
                 <el-input  v-model="form.specialoffer === 0?'否':'是'" autocomplete="off" placeholder="是否特价" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="11" v-if="isQuotedPrice">
+            <el-col  :span="6" v-if="isQuotedPrice">
               <el-form-item label="项目名称:" label-width="90px" prop="projectname">
                 <el-popover
                     placement="bottom"
@@ -74,12 +75,12 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11" v-if="isQuotedPrice">
+            <el-col :span="6" v-if="isQuotedPrice">
               <el-form-item label="项目编号:" label-width="90px" >
                 <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <el-col :span="6">
               <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
@@ -139,7 +140,7 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11">
+            <el-col  :span="6">
               <el-form-item label="报价日期:" label-width="90px">
                 <el-date-picker
                     v-model="form.billdate"
@@ -151,7 +152,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <el-col :span="6">
               <el-form-item label="有效期:" label-width="90px" >
                 <el-date-picker
                     v-model="date"
@@ -165,7 +166,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11">
+            <el-col :span="6">
               <el-form-item label="联系人:" label-width="90px" prop="contactsname">
                 <el-popover
                     placement="bottom"
@@ -225,11 +226,16 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <el-col  :span="6">
               <el-form-item label="手机号:" label-width="90px" >
                 <el-input  v-model="form.contactsphonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="总金额:" label-width="90px" >
+                <el-input  v-model="form.totalPrice" autocomplete="off" placeholder="总金额" disabled></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -237,7 +243,7 @@
         <el-divider></el-divider>
       </div>
       <div style="margin:30px 20px 20px 20px">
-        <quoted_price_product :id="form.sa_projectid" ref="quoterPrice" @checkForm="onSubmit"></quoted_price_product>
+        <quoted_price_product :id="form.sa_projectid" ref="quoterPrice" @checkForm="onSubmit" @totalPrice="queryTotalPrice"></quoted_price_product>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
@@ -322,6 +328,7 @@ export default {
       isQuotedPrice:false,
       date:[],
       form:{
+        totalPrice:0,
         type:'',
         projectnum:'',
         enterprisename:'',
@@ -420,6 +427,12 @@ export default {
         })
       })
     },
+    /*刷新总金额*/
+    queryTotalPrice(val){
+      console.log("总金额",val)
+      this.form.totalPrice = val
+      console.log(this.form)
+    },
     async projectList(){
       const res = await this.$api.requested(this.projectParam)
       console.log(res)

+ 6 - 6
src/HDrpManagement/projectChange/modules/detail.vue

@@ -69,22 +69,22 @@
         <el-button size="mini" slot="reference" icon="el-icon-more"></el-button>
       </el-popover>-->
     </div>
-    <div slot="slot0" class="container normal-panel">
+    <div slot="slot0" class=" normal-panel">
       <BaseInfo v-if="detailInfo" :detailInfo="detailInfo"/>
     </div>
-    <div slot="slot1" class="container normal-panel">
+    <div slot="slot1" class=" normal-panel">
       <StageTask v-if="mainData" :rowData="mainData"/>
     </div>
-    <div slot="slot2" class="container normal-panel">
+    <div slot="slot2" class=" normal-panel">
       <andEnterprise :rowData="mainData" v-if="flag === 1"/>
     </div>
-    <div slot="slot3" class="container normal-panel" >
+    <div slot="slot3" class=" normal-panel" >
       <product_set :data="mainData"  v-if="flag === 1"  />
     </div>
-    <div slot="slot4" class="container normal-panel">
+    <div slot="slot4" class=" normal-panel">
       <quotation />
     </div>
-    <div slot="slot5" class="container normal-panel">
+    <div slot="slot5" class=" normal-panel">
       <Rival v-if="mainData" :data="mainData" />
     </div>
   </basicDetails>

+ 5 - 2
src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add.vue

@@ -12,7 +12,7 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="企业名称:" prop="enterprisename">
+              <el-form-item label="客户名称:" prop="enterprisename">
                 <el-input v-model="form.enterprisename" placeholder="请选择企业" @focus="enterpriseList"></el-input>
               </el-form-item>
             </el-col>
@@ -44,11 +44,13 @@ import enterprise from './enterprise'
 export default {
   name: "add",
   props:["data"],
+  inject:["enterpriseType"],
   components:{enterprise},
   data(){
     return {
       visible:false,
       visibleEnterprise:false,
+      customertype:'',
       index:'',
       form:{
         sa_project_partiesid: 0,
@@ -69,6 +71,7 @@ export default {
       console.log("新增企业缔约信息")
       console.log(this.data)
       this.visible = true
+      console.log(this.enterpriseTypeList,'客户类型')
     },
     onSubmit(){
       this.form.sa_projectid = this.data.sa_projectid
@@ -104,8 +107,8 @@ export default {
       console.log("企业信息",data)
       this.form.sys_enterpriseid = data.sys_enterpriseid
       this.form.enterprisename = data.enterprisename
-
     },
+
   },
   mounted() {
 

+ 1 - 1
src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div >
-    <el-button size="mini" type="text" @click="onshow" >编辑</el-button>
+    <el-button size="mini" type="text" @click="onshow" >编 辑</el-button>
     <el-drawer
         title="编辑关联客户"
         :visible.sync="visible"

+ 92 - 0
src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/setCustomerType.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <el-button size="mini" type="text" @click="onshow">设置客户类型</el-button>
+    <el-drawer
+        title="设置客户类型"
+        :visible.sync="visible"
+        size="20%"
+        direction="rtl"
+        append-to-body
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="客户名称:" >
+                <el-input v-model="form.enterprisename" placeholder="请选择企业" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="客户类型:" prop="type">
+                <el-select v-model="form.type" placeholder="请选择客户类型" size="small"  style="width: 100%">
+                  <el-option
+                      v-for="item in enterpriseType()"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #999999; font-size: 10px">{{ item.remarks }}</span>
+                  </el-option>
+
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "setCustomerType",
+  props:["data"],
+  inject:["enterpriseType"],
+  data(){
+    return {
+      visible:false,
+      form:{
+        sa_project_partiesid: '',
+        type: ""
+      },
+      rules:{
+        type:[
+          { required: true, message: '请选择客户类型', trigger: 'change'},
+        ],
+      },
+    }
+  },
+  methods:{
+    onSubmit(){
+      console.log(this.form)
+      this.$refs.form.validate(async(valid) =>{
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": 20221116142502,
+          "content":this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.visible = false
+          this.$emit('setSuccess')
+        })
+      })
+    },
+    onClose(){
+      this.visible = false
+    },
+    onshow(){
+      this.visible = true
+      this.form = this.data
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 1 - 1
src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/toDel.vue

@@ -3,7 +3,7 @@
       title="确定删除该关联客户嘛"
       @confirm="onShow"
   >
-    <el-button slot="reference" size="mini" type="text"  >删除</el-button>
+    <el-button slot="reference" size="mini" type="text"  >删 除</el-button>
   </el-popconfirm>
 </template>
 

+ 26 - 30
src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -14,7 +14,6 @@
           clearable>
       </el-input>
     </div>
-
     <div style="margin-top: 20px">
       <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
         <template v-slot:customcol="scope">
@@ -25,38 +24,11 @@
         </template>
         <template v-slot:opreation="scope">
           <edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @updateSuccess="onSuccess"></edit>
+          <set_customer_type class="inline-16" :data="scope.data" @setSuccess="onSuccess"></set_customer_type>
           <to_del class="inline-16" :data="scope.data" @toDelSuccess="onSuccess"></to_del>
-<!--          <toVoid v-if="tool.checkAuth($route.name,'toVoid')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>-->
         </template>
       </tableLayout>
     </div>
-
-<!--    <basicLayout
-      ref="basicLayout" 
-      formPath="projectChange/andEnterprise" 
-      tableName="andEnterpriseTable" 
-      idName="sa_project_partiesid" 
-      :apiId="{query:20221027143702,del:20221027143802}" 
-      :options="options"
-      @listCreate="list"
-      customTitle="缔约信息">
-      <div slot="custom"></div>
-      <template v-slot:tbList="scope">
-        <div v-if="!scope.data.column.data[scope.data.column.columnname]">
-          &#45;&#45;
-        </div>
-        <div v-else-if="scope.data.column.columnname == 'province'">
-          {{`${scope.data.column.data['province']}、${scope.data.column.data['city']}、${scope.data.column.data['county']}`}}
-        </div>
-        <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
-        </div>
-      </template>
-      <template v-slot:opreation="scope">
-&lt;!&ndash;        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @updateSuccess="onSuccess"></edit>
-        <toVoid v-if="tool.checkAuth($route.name,'toVoid')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>&ndash;&gt;
-      </template>
-    </basicLayout>-->
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
@@ -77,12 +49,14 @@
 import add from './components/add'
 import edit from './components/edit'
 import to_del from './components/toDel'
+import set_customer_type from './components/setCustomerType'
 export default {
-  components:{add,edit,to_del},
+  components:{add,edit,to_del,set_customer_type},
   name: "index",
   props:["rowData"],
   data() {
     return {
+      enterpriseTypeList:'',
       tableHieght:"600px",
       tablecols:[],
       list:[],
@@ -102,6 +76,11 @@ export default {
       }
     }
   },
+  provide(){
+    return {
+      enterpriseType:() => this.enterpriseTypeList
+    }
+  },
   methods: {
     /*list (param) {
       param.content.sa_projectid = this.$route.query.id
@@ -136,6 +115,22 @@ export default {
     queryClick(){
       this.params.content.where.condition = this.search
       this.listData()
+    },
+    /*获取客户类型*/
+    async enterpriseType(){
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "typename": "customertypemx",
+          "parameter": {
+          }
+        }
+      })
+      this.enterpriseTypeList = res.data
+      console.log(this.enterpriseTypeList,"客户类型")
     }
   },
   mounted() {
@@ -143,6 +138,7 @@ export default {
   },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).andEnterpriseTable.tablecols
+    this.enterpriseType()
   },
 }
 </script>

+ 1 - 1
src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -12,7 +12,7 @@
         <div class="flex-align-center flex-between ">
           <slot name="operation"></slot>
           <div class="flex-align-center">
-            <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="productData(params.content.pageNumber = 1)" @clear="productData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
+            <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="productData(params.content.pageNumber = 1)" @clear="productData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
           </div>
         </div>
         <div class="produtMag-panel">

+ 19 - 6
src/SDrpManagement/QuotedPrice/components/quotedPriceProduct.vue

@@ -7,10 +7,10 @@
           suffix-icon="el-icon-search"
           v-model="param.content.where.condition"
           placeholder="产品名称,编号"
-          @keyup.enter.native="productData(param.content.pageNumber = 1)"
-          @clear="productData(param.content.pageNumber = 1)"
+          @keyup.enter.native="productData(param.content.pageNumber = 1)"
+          @clear="productData(param.content.pageNumber = 1)"
           clearable>
-      </el-input>&nbsp;
+      </el-input>
       <product_table style="float: right" :id="id" @checkForm="checkForm" ref="quoterPrice" @productAdd="productInitialization"></product_table>
     </div>
     <div class="produtMag-panel">
@@ -218,11 +218,12 @@ export default {
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
+      let totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
-
-          this.list[i].discountrate = this.list[i].discountrate * 100
-
+        this.list[i].discountrate = this.list[i].discountrate * 100
+        totalPrice = totalPrice + this.list[i].qty * this.list[i].price
       }
+      this.$emit("totalPrice",totalPrice)
       console.log(this.list,'产品配置信息')
     },
     /*产品配置信息*/
@@ -281,6 +282,18 @@ export default {
     onChangeNum (val,data,index) {
       console.log(val,data,index)
      /* data.amount = data.qty * data.price*/
+      console.log(data.orderminqty)
+      if (val < data.orderminqty){
+        val = data.orderminqty
+      }else {
+        let m = val % data.orderaddqty
+        console.log(m)
+        if (m !== 0){
+          val = val + data.orderaddqty - m
+          console.log(val,"新的数量值")
+          data.qty = val
+        }
+      }
       this.$set(this.list,index,data)
       this.$nextTick(()=>{
         let obj = this.list.map(e=>{

+ 0 - 20
src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -24,26 +24,6 @@
         <submit_to class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onSubmit="onSuccess"></submit_to>
         <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
       </div>
-<!--<<<<<<< HEAD
-      <div slot="slot0" class=" normal-panel">
-        <detailed :data="mainData"  v-if="flag"></detailed>
-      </div>
-      <div slot="slot1" class=" normal-panel">
-        <project_change :data="mainData" v-if="flag"></project_change>
-      </div>
-      <div slot="slot2" class=" normal-panel">
-        <productInventory :data="mainData" v-if="flag"></productInventory>
-      </div>
-      <div slot="slot3" class=" normal-panel">
-        <customer_assocalated :data="mainData" v-if="flag"></customer_assocalated>
-      </div>
-      <div slot="slot4" class=" normal-panel">
-        <contacts  :data="mainData"  v-if="flag"></contacts>
-      </div>
-&lt;!&ndash;      <div slot="slot4" class="container normal-panel">
-        <address_manage  :data="mainData"  v-if="flag"></address_manage>
-      </div>&ndash;&gt;
-=======-->
       <div slot="slot1" class=" normal-panel">
         <detailed :data="mainData"  v-if="flag"></detailed>
       </div>

+ 18 - 12
src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -11,7 +11,7 @@
           @clear="productData(param.content.pageNumber = 1)"
           clearable>
       </el-input>&nbsp;
-      <product_table style="float: right" :data="data"  ref="quoterPrice" @productAdd="productInitialization" ></product_table>
+<!--      <product_table style="float: right" :data="data"  ref="quoterPrice" @productAdd="productInitialization" ></product_table>-->
     </div>
     <div class="produtMag-panel">
       <el-table
@@ -108,17 +108,15 @@
           </template>
         </el-table-column>
         <el-table-column
-            fixed="right"
             prop="num"
             label="数量"
             width="180">
           <template slot-scope="scope">
-            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"  :disabled="data.status !== '新建'"></el-input-number>
+            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" disabled></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
             prop="marketprice"
-            fixed="right"
             label="牌价"
             width="100">
           <template slot-scope="scope">
@@ -127,25 +125,22 @@
         </el-table-column>
         <el-table-column
             prop="discountrate"
-            fixed="right"
             label="折扣(%)"
             width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"  :disabled="data.status !== '新建'"></el-input>
+            <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" disabled></el-input>
           </template>
         </el-table-column>
         <el-table-column
             prop="price"
-            fixed="right"
             label="单价"
             width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"  :disabled="data.status !== '新建'"></el-input>
+            <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" disabled></el-input>
           </template>
         </el-table-column>
         <el-table-column
             prop="amount"
-            fixed="right"
             label="金额"
             width="100">
           <template slot-scope="scope">
@@ -154,14 +149,14 @@
         </el-table-column>
         <el-table-column
             prop="specialoffer"
-            fixed="right"
             label="是否特价"
             width="100">
           <template slot-scope="scope">
             <i class="el-icon-check" v-if="scope.row.specialoffer === 1"  style="color: red;font-size: 20px"></i>
+            <p v-else>--</p>
           </template>
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             prop="operation"
             fixed="right"
             label="操作"
@@ -169,7 +164,7 @@
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="deleteProduct(scope.row)">删除</el-button>
           </template>
-        </el-table-column>
+        </el-table-column>-->
       </el-table>
       <div style="height: 35px;margin-top: 20px">
         <div style="float: left">总金额:{{ totalPrice }}元</div>
@@ -300,6 +295,17 @@ export default {
     onChangeNum (val,data,index) {
       console.log(val,data,index)
       /* data.amount = data.qty * data.price*/
+      if (val < data.orderminqty){
+        val = data.orderminqty
+      }else {
+        let m = val % data.orderaddqty
+        console.log(m)
+        if (m !== 0){
+          val = val + data.orderaddqty - m
+          console.log(val,"新的数量值")
+          data.qty = val
+        }
+      }
       this.$set(this.list,index,data)
       this.$nextTick(()=>{
         let obj = this.list.map(e=>{

+ 2 - 2
src/SDrpManagement/QuotedPrice/index.vue

@@ -10,7 +10,7 @@
         :detail-path="{path:'/quotedPriceDetail'}"
       >
       <div slot="titleRight">
-        <importExcel style="margin-left:10px" @onSuccess="onSuccess"></importExcel>
+<!--        <importExcel style="margin-left:10px" @onSuccess="onSuccess"></importExcel>-->
       </div>
       <template #custom >
         <div class="mt-10">
@@ -82,7 +82,7 @@
           {{issaler?scope.data.column.data.createby:'--'}}
         </div>
         <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
 <!--      <template v-slot:tbOpreation="scope">

+ 18 - 11
src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -1,26 +1,27 @@
 <template>
   <div>
     <el-drawer
-        title="创建项目报价"
+        title="创建项目报价"
         :visible.sync="drawer"
-        size="70%"
+        size="93%"
         direction="rtl"
         append-to-body
+        :show-close="false"
         @close="onClose">
       <div class="drawer__panel" style="margin-bottom: 0px">
         <el-row style="margin-top: 10px">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
-            <el-col :span="11">
+            <el-col :span="6">
               <el-form-item label="报价类型:" label-width="90px" >
                 <el-input v-model="form.type" autocomplete="off" placeholder="报价类型" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11">
+            <el-col  :span="6">
               <el-form-item label="是否特价:" label-width="90px" >
                 <el-input  v-model="form.specialOffer" autocomplete="off" placeholder="是否特价" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="11" v-if="isQuotedPrice">
+            <el-col  :span="6" v-if="isQuotedPrice">
               <el-form-item label="项目名称:" label-width="90px" prop="projectname">
                 <el-popover
                     placement="bottom"
@@ -74,12 +75,12 @@
 
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11" v-if="isQuotedPrice">
+            <el-col  :span="6" v-if="isQuotedPrice">
               <el-form-item label="项目编号:" label-width="90px" >
                 <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <el-col  :span="6">
               <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
@@ -132,7 +133,7 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11">
+            <el-col   :span="6">
               <el-form-item label="报价日期:" label-width="90px">
                 <el-date-picker
                     v-model="form.billdate"
@@ -144,7 +145,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <el-col :span="6">
               <el-form-item label="有效期:" label-width="90px" >
                 <el-date-picker
                     v-model="date"
@@ -158,7 +159,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :offset="2" :span="11">
+            <el-col   :span="6">
               <el-form-item label="联系人:" label-width="90px" prop="name">
                 <el-popover
                     placement="bottom"
@@ -218,11 +219,16 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <el-col  :span="6">
               <el-form-item label="手机号:" label-width="90px" >
                 <el-input  v-model="form.phonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="总金额:" label-width="90px" >
+                <el-input  v-model="form.totalPrice" autocomplete="off" placeholder="总金额" disabled></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -317,6 +323,7 @@ export default {
       isQuotedPrice:false,
       date:[],
       form:{
+        totalPrice:'',
         type:'',
         projectnum:'',
         enterprisename:'',