新建居间合同，合同显示调整

src/HDrpManagement/contractManage/components/addContract.vue

@@ -977,7 +977,7 @@
             <el-col :span="24">
               <el-form-item
                   :label="$t(`合同`) + ':'"
-                prop="ascription_title"
+                prop="ascription_title_new"
                 :rules="{ required: true, message: $t('请选择合同'), trigger: 'change' }"
               >
                 <el-popover placement="left" trigger="focus" v-model="contractVisible" width="700">
@@ -992,7 +992,7 @@
                     slot="reference"
                     size="small"
                     @focus="showChange('contractVisible')"
-                    v-model="form.ascription_title"
+                    v-model="form.ascription_title_new"
                     :placeholder="$t(`请选择合同`)"
                   ></el-input>
                 </el-popover>
@@ -1262,6 +1262,7 @@ export default {
         productdiscount: "",
         orderratio: "",
         ascription_title: "",
+        ascription_title_new:"",
         ascription_contractid: "",
         receiptName: "",
         rec_contactsid: "", //收货联系人
@@ -1278,7 +1279,7 @@ export default {
         sys_enterpriseid: [
           { required: true, message: this.$t("请选择客户"), trigger: "change" },
         ],
-        ascription_title: [
+        ascription_title_new: [
           {
             required: true,
             message: this.$t("请选择项目合同"),
@@ -1475,6 +1476,7 @@ export default {
       productdiscount: "",
       orderratio: "",
       ascription_title: "",
+      ascription_title_new:'',
       ascription_contractid: "",
       receiptName: "",
       rec_contactsid: "", //收货联系人
@@ -1621,6 +1623,7 @@ export default {
         productdiscount: "",
         orderratio: "",
         ascription_title: "",
+        ascription_title_new:"",
         ascription_contractid: "",
         receiptName: "",
         rec_contactsid: "", //收货联系人
@@ -1764,6 +1767,7 @@ export default {
     concratChange(data) {
       this.centerEnterpriseList = data.parties;
       this.form.ascription_title = data.title;
+      this.form.ascription_title_new = data.title ? data.billno + '-' +  data.title : data.billno
       this.form.ascription_contractid = data.sa_contractid;
       this.form.projectname = data.projectname;
       this.form.projectnum = data.projectnum;

src/HDrpManagement/contractManage/components/editContract.vue

@@ -475,14 +475,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`合同`)+':'" prop="ascription_title" :rules="{ required: true, message: this.$t('请选择合同'), trigger: 'change' }">
+              <el-form-item :label="$t(`合同`)+':'" prop="ascription_title_new" :rules="{ required: true, message: this.$t('请选择合同'), trigger: 'change' }">
                 <el-popover
                   placement="left"
                   trigger="focus"
                   v-model="contractVisible"
                   width="700">
                   <selectContract ref="contractRef" @onSelect="concratChange" @onCanel="contractVisible=false"></selectContract>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('contractVisible')" v-model="form.ascription_title"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('contractVisible')" v-model="form.ascription_title_new"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -655,6 +655,7 @@ export default {
         "productdiscount":'',
         "orderratio":'',
         "ascription_title":'',
+        "ascription_title_new":'',
         'ascription_contractid':'',
         'name':'',
         "rec_contactsid":'',//收货联系人
@@ -671,7 +672,7 @@ export default {
         sys_enterpriseid: [
           { required: true, message: this.$t('请选择合作伙伴'), trigger: 'blur' },
         ],
-        ascription_title: [
+        ascription_title_new: [
           { required: true, message: this.$t('请选择项目合同'), trigger: 'change' },
         ],
         begdate: [
@@ -801,8 +802,8 @@ export default {
       if (this.$route.query.type == '居间'){
         this.form.enterprisename = this.data.ascription_enterprisename
         this.form.customername = this.data.enterprisename
+        this.form.ascription_title_new = this.data.ascription_title ? this.data.billno + '-' +  this.data.ascription_title : this.data.billno
       }
-
       this.drawer = true
       if (!this.form.reminddays){
         let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
@@ -1045,6 +1046,7 @@ export default {
     },
     concratChange (data) {
       this.form.ascription_title = data.title
+      this.form.ascription_title_new = data.title ? data.billno + '-' +  data.title : data.billno
       this.form.ascription_contractid = data.sa_contractid
       this.form.projectname = data.projectname
       this.form.projectnum = data.projectnum

src/HDrpManagement/contractManage/components/priceDifference/addPriceDiff.vue

@@ -35,7 +35,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`合同`)+':'" prop="ascription_contractid" :rules="{ required: true, message: $t('请输入合同'), trigger: 'change' }">
-                <el-input v-model="ascription.ascription_title" :placeholder="$t(`合同`)" disabled></el-input>
+                <el-input v-model="ascription.ascription_title_new" :placeholder="$t(`合同`)" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -156,6 +156,7 @@ export default {
       ascription:{
         "enterprisename":"",
         "ascription_title":"",
+        "ascription_title_new":"",
         "projectname":"",
         "projectnum":"",
         "customername":"",
@@ -216,6 +217,7 @@ export default {
       this.form.signdate = this.data.signdate
       this.ascription = {
         "ascription_title":this.data.title,
+        "ascription_title_new":this.data.title ? this.data.billno + '-' +  this.data.title : this.data.billno,
         "projectname":this.data.projectname,
         "projectnum":this.data.projectnum,
         "customername":this.data.enterprisename,
@@ -238,6 +240,7 @@ export default {
       this.form.remarks = data.remarks
       this.ascription = {
         "ascription_title":this.data.title,
+        "ascription_title_new":this.data.title ? this.data.billno + '-' +  this.data.title : this.data.billno,
         "enterprisename":data.sys_enterpriseid == -1  ? '':data.enterprisename,
         "projectname":this.data.projectname,
         "projectnum":this.data.projectnum,

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

@@ -240,14 +240,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`合同`)+':'" prop="ascription_title">
+              <el-form-item :label="$t(`合同`)+':'" prop="ascription_title_new">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
                     v-model="concratVisible"
                     width="600">
                   <seleteProjectContract type="3" ref="project" @onSelect="concratChange" @onCanel="concratVisible=false" ></seleteProjectContract>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('concratVisible')" v-model="form.ascription_title"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('concratVisible')" v-model="form.ascription_title_new"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -394,6 +394,7 @@ export default {
         "productdiscount":'',
         "orderratio":'',
         "ascription_title":'',
+        "ascription_title_new":'',
         'ascription_contractid':'',
         'receiptName':'',
         "rec_contactsid":'',//收货联系人
@@ -409,7 +410,7 @@ export default {
         sys_enterpriseid: [
           { required: true, message: this.$t('请选择客户'), trigger: 'change' },
         ],
-        ascription_title: [
+        ascription_title_new: [
           { required: true, message: this.$t('请选择项目合同'), trigger: 'change' },
         ],
         begdate: [
@@ -652,7 +653,8 @@ export default {
     },
     concratChange (data) {
       this.centerEnterpriseList = data.parties
-      this.form.ascription_title = data.projectname
+      this.form.ascription_title = data.title
+      this.form.ascription_title_new = data.title ? data.billno + '-' +  data.title : data.billno
       this.form.ascription_contractid = data.sa_contractid
       this.form.projectname = data.projectname
       this.form.projectnum = data.projectnum

src/HDrpManagement/projectChange/modules/modules/contract/components/seleteProjectContract.vue

@@ -16,15 +16,15 @@
             width="180">
           </el-table-column>
           <el-table-column
-            prop="projectname"
-            :label="$t('合同名称')"
-            width="180">
+              prop="title"
+              :label="$t(`合同标题`)">
           </el-table-column>
           <el-table-column
-            prop="title"
-            :label="$t(`标题`)">
+            prop="projectname"
+            :label="$t('项目名称')"
+            width="180">
           </el-table-column>
-          <el-table-column>
+          <el-table-column :label="$t(`操作`)">
             <template slot-scope="scope">
               <el-button size="mini" type="text" @click="rowClick(scope.row)">{{$t('选 择')}}</el-button>
             </template>