代码上传

src/HDrpManagement/contractManage/components/addContract.vue

@@ -30,7 +30,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="整体折扣(%):" prop="discountrate">
+              <el-form-item label="折扣(%):" prop="discountrate">
                 <el-input type="text" size="small" v-model="form.discountrate"></el-input>
               </el-form-item>
             </el-col>
@@ -173,6 +173,7 @@
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>
@@ -230,6 +231,7 @@
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>
@@ -299,6 +301,7 @@
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -30,7 +30,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="整体折扣(%):" prop="discountrate">
+              <el-form-item label="折扣(%):" prop="discountrate">
                 <el-input type="text" size="small" v-model="form.discountrate"></el-input>
               </el-form-item>
             </el-col>
@@ -173,6 +173,7 @@
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>
@@ -230,6 +231,7 @@
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>
@@ -299,6 +301,7 @@
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -36,6 +36,7 @@
             {{scope.column.data[scope.column.columnname][0].brandname}}
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+          <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[[scope.column.columnname]] !== 0 && scope.column.columnname != 'operation' && scope.column.columnname != 'countPrice'">--</p>
         </template>
         <template v-slot:opreation="scope">
           <el-button v-if="editIndex == scope.data.sa_contract_itemsid" type="text" size="mini" @click="save" class="inline-16">保 存</el-button>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -9,7 +9,7 @@
         turnPageId="20221121201502"
         idname="sa_contractid"
         ownertable="sa_contract"
-        :tabs="mainData.type == '项目' ? ['产品清单','合同条款','角色信息'] : mainData.type == '框架' ? ['产品明细折扣','产品类别折扣'] : mainData.type == '居间' ? [] : ['工具清单','合同条款']"
+        :tabs="mainData.type == '项目' ? ['产品清单','合同条款','角色信息'] : mainData.type == '框架' ? ['产品明细折扣','产品类别折扣'] : mainData.type == '居间' ? null : ['工具清单','合同条款']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -168,8 +168,6 @@ export default {
     mainData: {
       handler (val) {
         this.isLeader = JSON.parse(window.sessionStorage.getItem('active_account')).userid == val.leader[0].userid        
-        console.log(this.isLeader);
-        
       },
       deep:true,
       immediate:true
@@ -207,7 +205,7 @@ export default {
             value:this.mainData.title
           },
           {
-            label:'合同打印模板',
+            label:'合同模板',
             value:this.mainData.modelname
           },
           {
@@ -220,7 +218,7 @@ export default {
           },
           {
             label:'合同类型',
-            value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目' : '经销项目' : ''
+            value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议' : '经销项目协议' : ''
           },
           {
             label:'业务员',
@@ -265,7 +263,7 @@ export default {
             value:this.mainData.title
           },
           {
-            label:'合同打印模板',
+            label:'合同模板',
             value:this.mainData.modelname
           },
           {
@@ -278,7 +276,7 @@ export default {
           },
           {
             label:'合同类型',
-            value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目' : '经销项目' : ''
+            value:this.mainData.type == '项目' ? this.mainData.typemx == '直销' ? '直销项目协议' : '经销项目协议' : ''
           },
           {
             label:'业务员',
@@ -324,7 +322,7 @@ export default {
             value:this.mainData.title
           },
           {
-            label:'合同打印模板',
+            label:'合同模板',
             value:this.mainData.modelname
           },
           {
@@ -337,10 +335,10 @@ export default {
           },
           {
             label:'合同类型',
-            value:'经销商合作'
+            value:'经销商合作协议'
           },
           {
-            label:'整体折扣(%)',
+            label:'折扣(%)',
             value:this.mainData.discountrate
           },
           {
@@ -383,7 +381,7 @@ export default {
             value:this.mainData.title
           },
           {
-            label:'合同打印模板',
+            label:'合同模板',
             value:this.mainData.modelname
           },
           {
@@ -392,7 +390,7 @@ export default {
           },
           {
             label:'合同类型',
-            value:this.mainData.type
+            value:'工具借用协议'
           },
           {
             label:'业务员',
@@ -437,7 +435,7 @@ export default {
             value:this.mainData.title
           },
           {
-            label:'合同打印模板',
+            label:'合同模板',
             value:this.mainData.modelname
           },
           {
@@ -450,7 +448,7 @@ export default {
           },
           {
             label:'合同类型',
-            value:this.mainData.type
+            value:'居间协议'
           },
           {
             label:'业务员',

src/HDrpManagement/contractModel/index.vue

@@ -32,8 +32,17 @@
 
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.data[[scope.data.column.columnname]] == '项目'">
-          <span v-if="scope.data.column.data.typemx == '直销'">直销项目</span>
-          <span v-else-if="scope.data.column.data.typemx == '经销'">经销项目</span>
+          <span v-if="scope.data.column.data.typemx == '直销'">直销项目协议</span>
+          <span v-else-if="scope.data.column.data.typemx == '经销'">经销项目协议</span>
+        </div>
+        <div v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '框架'">
+          经销商合作协议
+        </div>
+        <div v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '工具借用'">
+          工具借用协议
+        </div>
+        <div v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '居间'">
+          居间协议
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}