报价单新增编辑详情页面新增传真电话

src/Form/QuotedPrice/edit.vue

@@ -11,20 +11,20 @@
         append-to-body
         @close="onClose">
       <div class="drawer__panel" style="margin-bottom: 0px">
-        <el-row style="margin-top: 10px">
+        <el-row style="margin-top: 10px" :gutter="10">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
             <el-col :span="6">
-              <el-form-item label="报价类型:" label-width="90px" >
+              <el-form-item label="报价类型:" label-width="100px" >
                 <el-input v-model="form.quotedpricetype" autocomplete="off" placeholder="报价类型" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="6">
-              <el-form-item label="是否特价:" label-width="90px" >
+              <el-form-item label="是否特价:" label-width="100px" >
                 <el-input  v-model="form.specialoffer === 0?'否':'是'" autocomplete="off" placeholder="是否特价" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="6" v-if="isQuotedPrice">
-              <el-form-item label="项目名称:" label-width="90px" prop="projectname">
+              <el-form-item label="项目名称:" label-width="100px" prop="projectname">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -81,12 +81,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="6" v-if="isQuotedPrice">
-              <el-form-item label="项目编号:" label-width="90px" >
+              <el-form-item label="项目编号:" label-width="100px" >
                 <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
+              <el-form-item label="客户名称:" label-width="100px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -143,33 +143,17 @@
               </el-form-item>
             </el-col>
             <el-col  :span="6">
-              <el-form-item label="报价日期:" label-width="90px">
-                <el-date-picker
-                    v-model="form.billdate"
-                    style="width: 100%"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
+              <el-form-item label="电话:" label-width="100px" >
+                <el-input  v-model="form.telephone" autocomplete="off" placeholder="输入电话" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="有效期:" label-width="90px" >
-                <el-date-picker
-                    v-model="date"
-                    style="width: 100%"
-                    type="daterange"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
+            <el-col  :span="6">
+              <el-form-item label="传真:" label-width="100px" >
+                <el-input  v-model="form.fax" autocomplete="off" placeholder="输入传真" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="联系人:" label-width="90px" prop="name">
+              <el-form-item label="联系人:" label-width="100px" prop="name">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -210,7 +194,7 @@
                     </el-table-column>
                     <el-table-column
                         label="地址"
-                        >
+                    >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                       </template>
@@ -233,10 +217,37 @@
               </el-form-item>
             </el-col>
             <el-col  :span="6">
-              <el-form-item label="手机号:" label-width="90px" >
+              <el-form-item label="联系人手机号:" label-width="100px" >
                 <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="100px">
+                <el-date-picker
+                    v-model="form.billdate"
+                    style="width: 100%"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="有效期:" label-width="100px" >
+                <el-date-picker
+                    v-model="date"
+                    style="width: 100%"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+
           </el-form>
         </el-row>
       </div>
@@ -340,6 +351,8 @@ export default {
         enterprisename:'',
         name:'',
         phonenumber:'',
+        fax:'',
+        telephone:'',
         specialOffer:'否',
         sa_quotedpriceid:0,     //sat_notice_classid<=0时 为新增
         sys_enterpriseid: "",
@@ -515,6 +528,8 @@ export default {
       this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.form.fax = ''
+      this.form.telephone = ''
       this.projectShow = false
     },
     /*更改项目前提示*/
@@ -567,6 +582,8 @@ export default {
       this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.form.fax = ''
+      this.form.telephone = ''
       this.customerShow = false
     },
     /*联系人选择信息*/
@@ -574,6 +591,8 @@ export default {
       this.form.contactsid = val.contactsid
       this.form.contactsname = val.name
       this.form.contactsphonenumber = val.phonenumber
+      this.form.fax = val.fax
+      this.form.telephone = val.telephone
       this.contactsShow = false
     },
     /*项目翻页*/

src/Form/QuotedPrice/editCopy.vue

@@ -136,29 +136,13 @@
             </el-form-item>
           </el-col>
           <el-col  :span="6">
-            <el-form-item label="报价日期:" label-width="90px">
-              <el-date-picker
-                  v-model="form.billdate"
-                  style="width: 100%"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="选择日期"
-                  :picker-options="pickerOptions">
-              </el-date-picker>
+            <el-form-item label="电话:" label-width="100px" >
+              <el-input  v-model="form.telephone" autocomplete="off" placeholder="输入电话" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="有效期:" label-width="90px" >
-              <el-date-picker
-                  v-model="date"
-                  style="width: 100%"
-                  type="daterange"
-                  value-format="yyyy-MM-dd"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  :picker-options="pickerOptions">
-              </el-date-picker>
+          <el-col  :span="6">
+            <el-form-item label="传真:" label-width="100px" >
+              <el-input  v-model="form.fax" autocomplete="off" placeholder="输入传真" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -203,7 +187,7 @@
                   </el-table-column>
                   <el-table-column
                       label="地址"
-                     >
+                  >
                     <template slot-scope="scope">
                       <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                     </template>
@@ -230,6 +214,33 @@
               <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-date-picker
+                  v-model="form.billdate"
+                  style="width: 100%"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"
+                  :picker-options="pickerOptions">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效期:" label-width="90px" >
+              <el-date-picker
+                  v-model="date"
+                  style="width: 100%"
+                  type="daterange"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="pickerOptions">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
         </el-form>
       </el-row>
     </div>
@@ -332,6 +343,8 @@ export default {
         enterprisename:'',
         name:'',
         phonenumber:'',
+        fax:'',
+        telephone:'',
         specialOffer:'否',
         sa_quotedpriceid:0,     //sat_notice_classid<=0时 为新增
         sys_enterpriseid: "",
@@ -494,6 +507,8 @@ export default {
       this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.form.fax = ''
+      this.form.telephone = ''
       this.projectShow = false
     },
     /*更改项目前提示*/
@@ -546,6 +561,8 @@ export default {
       this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.form.fax = ''
+      this.form.telephone = ''
       this.customerShow = false
     },
     /*联系人选择信息*/
@@ -553,6 +570,8 @@ export default {
       this.form.contactsid = val.contactsid
       this.form.contactsname = val.name
       this.form.contactsphonenumber = val.phonenumber
+      this.form.fax = val.fax
+      this.form.telephone = val.telephone
       this.contactsShow = false
     },
     /*项目翻页*/

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add.vue

@@ -127,6 +127,7 @@ export default {
       console.log(this.data)
       this.visible = true
       console.log(this.enterpriseTypeList,'客户类型')
+      this.selectCustomer()
     },
     async onSubmit(){
       this.form.sa_projectid = this.$route.query.id

src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/add.vue

@@ -24,7 +24,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item  label="详细地址:" prop="address">
-                <el-input type="textarea" rows="2" v-model="form.address" placeholder="请输入家庭住址"></el-input>
+                <el-input type="textarea" rows="2" v-model="form.address" placeholder="请输入详细地址"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/edit.vue

@@ -24,7 +24,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item  label="详细地址:" prop="address">
-                <el-input type="textarea" rows="2" v-model="form.address" placeholder="请输入家庭住址"></el-input>
+                <el-input type="textarea" rows="2" v-model="form.address" placeholder="请输入详细地址"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -8,10 +8,13 @@
         <el-descriptions-item label="项目名称">{{ basic.projectname?basic.projectname:"--"}}</el-descriptions-item>
         <el-descriptions-item label="项目地址">{{ basic.address?basic.address:"--" }}</el-descriptions-item>
         <el-descriptions-item label="客户">{{ basic.enterprisename?basic.enterprisename:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="负责人">{{ basic.leader.length !== 0?basic.leader[0].name:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="电话">{{ basic.telephone?basic.telephone:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="传真">{{ basic.fax?basic.fax:"--" }}</el-descriptions-item>
         <el-descriptions-item label="联系人">{{ basic.contactsname?basic.contactsname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="手机号">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="有效期">{{ basic.begdate?basic.begdate + '至' + basic.enddate:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="负责人">{{ basic.leader.length !== 0?basic.leader[0].name:"--" }}</el-descriptions-item>
+
         <el-descriptions-item label="备注">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
         <el-descriptions-item label="状态">{{ basic.status?basic.status:"--" }}</el-descriptions-item>
         <el-descriptions-item label="是否特价">{{ basic.specialoffer === 1?'是':'否' }}</el-descriptions-item>

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -9,20 +9,20 @@
         :show-close="false"
         @close="onClose">
       <div class="drawer__panel" style="margin-bottom: 0px">
-        <el-row style="margin-top: 10px">
+        <el-row style="margin-top: 10px" :gutter="10">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
             <el-col :span="6">
-              <el-form-item label="报价类型:" label-width="90px" >
+              <el-form-item label="报价类型:" label-width="100px" >
                 <el-input v-model="form.type" autocomplete="off" placeholder="报价类型" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="6">
-              <el-form-item label="是否特价:" label-width="90px" >
+              <el-form-item label="是否特价:" label-width="100px" >
                 <el-input  v-model="form.specialOffer" autocomplete="off" placeholder="是否特价" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="6" v-if="isQuotedPrice">
-              <el-form-item label="项目名称:" label-width="90px" prop="projectname">
+              <el-form-item label="项目名称:" label-width="100px" prop="projectname">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -80,12 +80,12 @@
               </el-form-item>
             </el-col>
             <el-col  :span="6" v-if="isQuotedPrice">
-              <el-form-item label="项目编号:" label-width="90px" >
+              <el-form-item label="项目编号:" label-width="100px" >
                 <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="6">
-              <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
+              <el-form-item label="客户名称:" label-width="100px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -141,34 +141,18 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col   :span="6">
-              <el-form-item label="报价日期:" label-width="90px">
-                <el-date-picker
-                    v-model="form.billdate"
-                    style="width: 100%"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
+            <el-col  :span="6">
+              <el-form-item label="电话:" label-width="100px" >
+                <el-input  v-model="form.telephone" autocomplete="off" placeholder="输入电话" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="有效期:" label-width="90px" >
-                <el-date-picker
-                    v-model="date"
-                    style="width: 100%"
-                    type="daterange"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
+            <el-col  :span="6">
+              <el-form-item label="传真:" label-width="100px" >
+                <el-input  v-model="form.fax" autocomplete="off" placeholder="输入传真" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col   :span="6">
-              <el-form-item label="联系人:" label-width="90px" prop="name">
+              <el-form-item label="联系人:" label-width="100px" prop="name">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -209,7 +193,7 @@
                     </el-table-column>
                     <el-table-column
                         label="地址"
-                        >
+                    >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                       </template>
@@ -232,10 +216,37 @@
               </el-form-item>
             </el-col>
             <el-col  :span="6">
-              <el-form-item label="手机号:" label-width="90px" >
+              <el-form-item label="联系人手机号:" label-width="100px" >
                 <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="100px">
+                <el-date-picker
+                    v-model="form.billdate"
+                    style="width: 100%"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="有效期:" label-width="100px" >
+                <el-date-picker
+                    v-model="date"
+                    style="width: 100%"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+
           </el-form>
         </el-row>
       </div>
@@ -339,6 +350,8 @@ export default {
         enterprisename:'',
         name:'',
         phonenumber:'',
+        fax:'',
+        telephone:'',
         specialOffer:'否',
         sa_quotedpriceid:0,     //sat_notice_classid<=0时 为新增
         sys_enterpriseid: "",
@@ -505,6 +518,8 @@ export default {
       this.form.contactsid = 0
       this.form.name = ''
       this.form.phonenumber = ''
+      this.form.fax = ''
+      this.form.telephone = ''
       this.projectShow = false
     },
     /*客户选择信息*/
@@ -514,6 +529,8 @@ export default {
       this.form.contactsid = 0
       this.form.name = ''
       this.form.phonenumber = ''
+      this.form.fax = ''
+      this.form.telephone = ''
       this.customerShow = false
     },
     /*联系人选择信息*/
@@ -521,6 +538,8 @@ export default {
       this.form.contactsid = val.contactsid
       this.form.name = val.name
       this.form.phonenumber = val.phonenumber
+      this.form.fax = val.fax
+      this.form.telephone = val.telephone
       this.contactsShow = false
     },
     /*项目分页*/

src/SDrpManagement/salerPrivatecustomer/detail/modules/contacts/modules/add.vue

@@ -170,6 +170,16 @@
                 <el-input   autosize v-model="form.email" placeholder="请输入邮箱"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item  label="电话:" >
+                <el-input  autosize v-model="form.telephone" placeholder="请输入电话" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="传真:" >
+                <el-input  autosize v-model="form.fax" placeholder="请输入传真" ></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item  label="单位:" >
                 <el-input  autosize v-model="form.enterprisename" placeholder="请输入单位" disabled></el-input>
@@ -264,7 +274,9 @@ export default {
         workaddress: 0,
         isdefault: 1,
         isprimary: 1,
-        sys_phonebookid:''
+        sys_phonebookid:'',
+        telephone:'',
+        fax:''
       },
       rules:{
         name: [