合同调整

src/HDrpManagement/BrandManage/modules/add.vue

@@ -6,6 +6,7 @@
       :visible.sync="drawer"
       size="800px"
       direction="rtl"
+      :show-close="false"
       append-to-body>
       <div class="drawer__panel">
       <div>

src/HDrpManagement/BrandManage/modules/edit.vue

@@ -6,6 +6,7 @@
       :visible.sync="drawer"
       size="90%"
       direction="rtl"
+      :show-close="false"
       append-to-body>
       <div class="drawer__panel">
         <el-form  :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="80px">

src/HDrpManagement/contractManage/modules/detail.vue

@@ -2,7 +2,7 @@
   <div>
     <basicDetails
         ref="details"
-        :titleText="mainData.billno"
+        :titleText="mainData.title"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221121201502"
@@ -219,9 +219,13 @@ export default {
             value:this.mainData.billno
           },
           {
-            label:'标题',
+            label:'合同标题',
             value:this.mainData.title
           },
+          {
+            label:'合同类型',
+            value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议' : '经销项目协议' : ''
+          },
           {
             label:'合同模板',
             value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议模板' : '经销项目协议模板' : ''
@@ -235,13 +239,10 @@ export default {
             value:this.mainData.projectname
           },
           {
-            label:'项目地址',
-            value:this.mainData.projectname ? this.mainData.province + this.mainData.city + this.mainData.county + this.mainData.address:'--'
-          },
-          {
-            label:'合同类型',
-            value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议' : '经销项目协议' : ''
+            label:'项目编号',
+            value:this.mainData.projectnum?this.mainData.projectnum:'--'
           },
+
           {
             label:'业务员',
             value:this.mainData.salername
@@ -260,9 +261,13 @@ export default {
           },
           {
             label:'签约金额(元)',
-            value:this.mainData.signamount?this.mainData.signamount:0
+            value:this.mainData.signamount?this.mainData.signamount:0,
+            style:function () {
+              let style = {color:'#3874f6'}
+              return style
+            }
           },
-          {
+          /*{
             label:'收货人',
             value:this.mainData.name
           },
@@ -277,7 +282,7 @@ export default {
           {
             label:'创建人',
             value:this.mainData.createby
-          },
+          },*/
           {
             label:'状态',
             value:this.mainData.status,
@@ -299,10 +304,10 @@ export default {
               return style
             }
           },
-          {
+         /* {
             label:'合同描述',
             value:this.mainData.remarks
-          },
+          },*/
         ] : this.mainAreaData = [
           /* 经销信息 */
           {
@@ -637,13 +642,17 @@ export default {
                     value:this.mainData.billno
                   },
                   {
-                    label:'标题',
+                    label:'合同标题',
                     value:this.mainData.title
                   },
                   {
                     label:'合同模板',
                     value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议模板' : '经销项目协议模板' : ''
                   },
+                  {
+                    label:'合同类型',
+                    value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议' : '经销项目协议' : ''
+                  },
                   {
                     label:'客户',
                     value:this.mainData.enterprisename
@@ -652,17 +661,21 @@ export default {
                     label:'项目名称',
                     value:this.mainData.projectname
                   },
+                  {
+                    label:'项目编号',
+                    value:this.mainData.projectnum
+                  },
                   {
                     label:'项目地址',
                     value:this.mainData.projectname ? this.mainData.province + this.mainData.city + this.mainData.county + this.mainData.address:'--'
                   },
                   {
-                    label:'合同类型',
-                    value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议' : '经销项目协议' : ''
+                    label:'收货人',
+                    value:this.mainData.name
                   },
                   {
-                    label:'业务员',
-                    value:this.mainData.salername
+                    label:'收货人电话',
+                    value:this.mainData.phonenumber
                   },
                   {
                     label:'合同有效期',
@@ -681,13 +694,12 @@ export default {
                     value:this.mainData.signamount?this.mainData.signamount:0
                   },
                   {
-                    label:'收货人',
-                    value:this.mainData.name
-                  },
-                  {
-                    label:'收货人电话',
-                    value:this.mainData.phonenumber
+                    label:'业务员',
+                    value:this.mainData.salername
                   },
+
+
+
                   {
                     label:'状态',
                     value:this.mainData.status,
@@ -723,6 +735,7 @@ export default {
                   {label:'提交时间',value:this.mainData.submitdate},
                   {label:'审核人',value:this.mainData.checkby},
                   {label:'审核时间',value:this.mainData.checkdate},
+                 /* {label:'作废原因',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum},*/
                   {label:'转手次数',value:this.mainData.leader[0].leadernum == 0?'0':this.mainData.leader[0].leadernum}
                 ]
               }

src/HDrpManagement/serveBill/modules/detail.vue

@@ -19,7 +19,7 @@
       </div>
       <div slot="customOperation" >
         <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" :data="mainData" @onSuccess="queryMainData" />
-        <changeBill v-if="mainData.status == '提交' && tool.checkAuth($route.name,'changeBill')" class="inline-16" @onSuccess="queryMainData" :data="mainData"></changeBill>
+        <changeBill v-if="mainData.status == '待指派' && tool.checkAuth($route.name,'changeBill')" class="inline-16" @onSuccess="queryMainData" :data="mainData"></changeBill>
         <customBtn 
           btnName="提交"
           message="确认提交当前服务申请单吗?"

src/HManagement/department/staff/detail/index.vue

@@ -97,6 +97,10 @@ export default {
         {
           label:'性别',
           value:this.mainData.sex
+        },
+        {
+          label:'是否服务人员',
+          value:this.mainData.isworker === 1?'是':'否'
         }
       ]
     },

src/SDrpManagement/agentOrder/modules/add.vue

@@ -102,7 +102,8 @@ export default {
         "pay_enterpriseid": 0, //结算单位
         "rebate_used":0,//默认0，是否使用返利金
         "billdate":"",//单据日期，默认创建日期
-        "signbacknum":""
+        "signbacknum":"",
+        "contractname":''
       },
       rules: {
         sa_brandid: [{
@@ -149,6 +150,7 @@ export default {
       this.specordermx()
     },
     submitForm() {
+      console.log(this.form,"form")
       this.$refs['form'].validate(async valid => {
         if (!valid) return
         const res = await this.$api.requested({
@@ -190,10 +192,12 @@ export default {
       this.form.sys_enterpriseid = row.sys_enterpriseid
     },
     contractClick (row) {
+      console.log(row,'row')
       this.form.sa_contractid = row.sa_contractid
       this.form.sa_projectid = row.sa_projectid
       this.form.contractname = row.title === ''?'未知':row.title
       this.visible = false
+      this.$refs['form'].validateField('contractname')
     },
     activityClick (row) {
       this.form.sa_promotionid = row.sa_promotionid

src/template/salesForecastUseProject/index.vue

@@ -16,6 +16,11 @@
           <el-table-column
             prop="status"
             label="状态">
+            <template slot-scope="scope">
+              <span style="color:#52c41a" v-if="scope.row.status == '跟进中'">{{scope.row.status}}</span>
+              <span style="color:#fa8c16" v-else-if="scope.row.status == '已成交'">{{scope.row.status}}</span>
+              <span style="color:#999999" v-else-if="scope.row.status == '已失败'">{{scope.row.status}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="projectnum"
@@ -75,7 +80,7 @@ export default {
       list:[],
       currentPage:0,
       total:0,
-      timer:0
+      timer:0,
     }
   },
   methods:{