2022-12-1 10:00

src/HDrpManagement/contractManage/components/TimeSelect.vue

@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <span style="font-size:14px;">{{title && title}}</span>
+    <el-date-picker
+      v-model="time"
+      type="daterange"
+      unlink-panels
+      range-separator="至"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期"
+      @change="timeChange"
+    >
+    </el-date-picker>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TimeSelect',
+  data() {
+    return {
+      start:'',
+      over:'',
+      time:''
+    };
+  },
+  props: ['title'],
+  computed:{
+  },
+  watch:{
+  },
+  methods: {
+    timeChange(e) {
+      if(!e) {
+        this.$emit('clearSelect')
+        return
+      } 
+      let result = e.map(item => {
+        return this.changeTimeFormat(item.getTime())
+      })   
+      this.$emit('timeChange',result)
+    },
+    changeTimeFormat(time) {
+      var date = new Date(time);
+      var month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+      var currentDate = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      return date.getFullYear() + "-" + month + "-" + currentDate
+    }
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/contractManage/components/addContract.vue

@@ -345,7 +345,7 @@ import {mapGetters} from 'vuex'
 import selectPople from './selectSaler'
 import selectAgent from './selectAgent'
 import seleteProject from './seleteProject'
-import TimeSelect from '@/HDrpManagement/projectChange/components/TimeSelect'
+import TimeSelect from './TimeSelect'
 import selectModel from './seleteModel'
 export default {
   name: '',
@@ -417,9 +417,6 @@ export default {
         salername: [
           { required: true, message: '请选择经销商', trigger: 'change' },
         ],
-        title: [
-          { required: true, message: '请输入合同标题', trigger: 'blur' },
-        ],
         discountrate: [
           { validator: checkNumber, trigger: 'blur'},
           { validator: NumberSize, trigger: 'blur'}

src/HDrpManagement/contractManage/components/contractClause/contractClause.vue

@@ -9,7 +9,7 @@
       <tableLayout :layout="tablecols" :data="list" :opwidth="200" :width="false" height="calc(100vh - 550px)" :custom="true" fixedName="operation" >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'content'">
-            <el-input v-if="editIndex==scope.column.data.sa_contract_clauseid" v-model="form.content" size="small" placeholder="请输入条款"></el-input>
+            <el-input v-if="editIndex==scope.column.data.sa_contract_clauseid" type="textarea" v-model="form.content" size="small" placeholder="请输入条款"></el-input>
             <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -344,7 +344,7 @@ import selectPople from './selectSaler'
 import selectAgent from './selectAgent'
 import seleteProject from './seleteProject'
 import selectModel from './seleteModel'
-import TimeSelect from '@/HDrpManagement/projectChange/components/TimeSelect'
+import TimeSelect from './TimeSelect'
 import { log } from '@antv/g2plot/lib/utils'
 
 export default {
@@ -421,9 +421,6 @@ export default {
         enterprisename: [
           { required: true, message: '请选择经销商', trigger: 'change' },
         ],
-        title: [
-          { required: true, message: '请填写合同标题', trigger: 'blur' },
-        ],
         discountrate: [
           { validator: checkNumber, trigger: 'blur'},
           { validator: NumberSize, trigger: 'blur'}

src/HDrpManagement/contractManage/modules/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <basicDetails
-        v-if="Object.keys(mainData)"
+        v-if="Object.keys(mainData).length > 0"
         ref="details"
         :titleText="mainData.billno"
         :editData="mainData"
@@ -116,9 +116,9 @@
           <template v-slot:del="scope">
             <delete-btn
              :nameId="20221128160302" 
-             :disabled="mainData.status != '新建' || !isLeader" nameKey="sa_contract_clauseids" 
+             nameKey="sa_contract_clauseids" 
              :id="scope.data.sa_contract_clauseid" @deleteSuccess="$refs.Claus.listData()"
-             v-if="tool.checkAuth($route.name,'delete')"
+             v-if="scope.data.sa_contract_clauseid == 0"
             ></delete-btn>
           </template>
         </contractClause>

src/HDrpManagement/contractModel/modules/detail.vue

@@ -14,6 +14,7 @@
                 v-if="scope.column.data.sa_contract_template_clauseid == 0 || scope.column.data.sa_contract_template_clauseid == currentEdit.sa_contract_template_clauseid" 
                 v-model="scope.column.data.content" size="small" 
                 placeholder="请输入条款"
+                type="textarea"
               ></el-input>
               <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
             </div>
@@ -22,8 +23,6 @@
                 v-if="currentEdit.sa_contract_template_clauseid!=scope.column.data.sa_contract_template_clauseid"
                 :disabled="true"
                 :value="scope.column.data.editable"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
                 :active-value="1"
                 :inactive-value="0"
                 size="mini">
@@ -31,8 +30,6 @@
               <el-switch
                 v-else
                 v-model="currentEdit.editable"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
                 :active-value="1"
                 :inactive-value="0"
                 size="mini">
@@ -76,11 +73,11 @@ export default {
   data() {
     return {
       type:{
-        1:'直销项目',
-        2:'经销项目',
+        1:'直销项目协议',
+        2:'经销项目协议',
         3:'经销商合作协议',
-        4:'居间',
-        5:'工具借用',
+        4:'居间协议',
+        5:'工具借用协议',
       },
       params: {
         "id": 20221125200102,