币种;length;计划竣工时间自动生成

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -380,6 +380,7 @@ func (this *OilContractController) GetDictList() {
 	dictList["ContractClass"] = dictSvc.GetKeyValueItems("ContractClass")
 	dictList["ProjectType"] = dictSvc.GetKeyValueItems("ProjectType")
 	dictList["ContractMode"] = dictSvc.GetKeyValueItems("ContractMode")
+	dictList["CurrencyType"] = dictSvc.GetKeyValueItems("CurrencyType")
 
 
 	//var dictCustomer []svccustomer.Customer

src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -416,6 +416,7 @@
       },
       orgtreeChange (val) {
         this.userOptions = []
+        console.log(val, '22222')
         let deptid = val[val.length - 1]
         let auditstepcode = 'PROF_RECE'
         api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-check/index.vue

@@ -14,7 +14,7 @@
         <span style="float: right;">
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">导入</el-button> -->
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button> -->
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键处理</el-button>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键审批</el-button>
           <el-button type="info" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonDelete">取消</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -373,6 +373,7 @@
           }
           // 获取第一列评价格式
           var list = this.evaluation_list
+          console.log('1111111111111111111111111111111111111111111')
           for(var i = 0; i < list.length ; i++){
             if(Number(list[i].Score) > Number(list[i].NormalScore)){
               this.$message.error('业绩评价填写的分数不能大于标准分值');
@@ -393,6 +394,7 @@
         }else{//专业处室评价
           this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
           var list = this.evaluation_list
+          console.log('2222222222222222222222222222222')
           for(var i = 0; i < list.length ; i++){
             if(Number(list[i].Score) > Number(list[i].NormalScore)){
               this.$message.error('业绩评价填写的分数不能大于标准分值');

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluationlist.vue

@@ -138,6 +138,7 @@
         return function(type,k){
           var num = 0;
           var list = this.entityListData.entityList
+          console.log('33333333333333333333333')
           for(var index = 0 ; index < list.length ; index++){
             var code = Number(list[index].LevelCode)
             if(type == list[index].typeStatus&&code==2){
@@ -155,6 +156,7 @@
         return function(){
           var num = 0;
           var list = this.entityListData.entityList
+          console.log('444444444444444444444444444')
           for(var index = 0 ; index < list.length ; index++){
             var code = Number(list[index].LevelCode)
             if(list[index].LevelCode == 1){
@@ -271,6 +273,7 @@
           console.log('上级节点内容',res)
           var data = res.data.items
           var list = []
+          console.log('5555555555555555555555555')
           for(var index = 0 ; index < data.length ; index++){
             data[index].typeStatus = index
             data[index].Score = '0'
@@ -278,6 +281,7 @@
 
             this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
             if(data[index].Son!=null&&data[index].Son!=undefined){
+              console.log('6666666666666666666666666666')
               for(var k = 0 ; k < data[index].Son.length ; k++){
                 data[index].Son[k].typeStatus = index
                 data[index].Son[k].Score = data[index].Son[k].NormalScore
@@ -304,21 +308,25 @@
           console.log('编辑后的内容',this.category,res)
           var data = res.data.items
           var list = []
-          for(var index = 0 ; index < data.length ; index++){
-            data[index].typeStatus = index
-            data[index].Score = data[index].Score==undefined||data[index].Score==''?'0':data[index].Score
-            list.push(data[index])
-            this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
-            if(data[index].Son!=null&&data[index].Son!=undefined){
-              for(var k = 0 ; k < data[index].Son.length ; k++){
-                data[index].Son[k].typeStatus = index
-                data[index].Son[k].Score = data[index].Son[k].Score==undefined||data[index].Son[k].Score==''?'0':data[index].Son[k].Score
-                list.push(data[index].Son[k])
+          if (data) {
+            console.log('77777777777777777777')
+            for(var index = 0 ; index < data.length ; index++){
+              data[index].typeStatus = index
+              data[index].Score = data[index].Score==undefined||data[index].Score==''?'0':data[index].Score
+              list.push(data[index])
+              this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
+              if(data[index].Son!=null&&data[index].Son!=undefined){
+                console.log('8888888888888888888888888888')
+                for(var k = 0 ; k < data[index].Son.length ; k++){
+                  data[index].Son[k].typeStatus = index
+                  data[index].Son[k].Score = data[index].Son[k].Score==undefined||data[index].Son[k].Score==''?'0':data[index].Son[k].Score
+                  list.push(data[index].Son[k])
+                }
               }
             }
+            this.entityListData.entityList = list
+            console.log('处理完的数据',list)
           }
-          this.entityListData.entityList = list
-          console.log('处理完的数据',list)
         }).catch(err => {
           console.error(err)
         })

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -16,7 +16,7 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link> -->
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button> -->
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键处理</el-button>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键审批</el-button>
           <el-button type="info" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonDelete">取消</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>
@@ -543,6 +543,7 @@
 
         let myCreateOn = []
         // 解析时间
+        console.log('999999999999999999999999999')
         if (this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year-check/index.vue

@@ -16,7 +16,7 @@
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="onChangeSelect">{{selectBoolean?'取消':'一键处理'}}</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectBoolean" @click="onChangeSelectSubmit">处理</el-button> -->
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键处理</el-button>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键审批</el-button>
           <el-button type="info" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonDelete">取消</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -16,7 +16,7 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link> -->
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button> -->
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键处理</el-button>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键审批</el-button>
           <el-button type="info" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonDelete">取消</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/evaluationlist.vue

@@ -253,6 +253,7 @@
       },
 
       getDictOptions() {
+        console.log('1111')
         api.getDictList(this.$axios).then(res => {
           //this.dictOptions.customerList = res.data.items['customerList']
           //this.dictOptions.projectList = res.data.items['projectList']
@@ -359,8 +360,10 @@
           majorAduit: this.formData.ThirdAudit
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
+          console.log('2222', res)
           this.dictData = res.data.items
           this.organizeOption = res.data.items['Organizes']
+          this.CurrencyOptions = res.data.items['CurrencyType']
           this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
           this.UnitOrgOptions = res.data.items['UnitOrgList']
           this.UnitOrg = res.data.items['Register'].CheckUnitId

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/operation.vue

@@ -106,7 +106,7 @@
 
           <el-col :span="8">
             <el-form-item label="合同总工期" prop="ContractPeriod">
-              <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
+              <el-input v-model="formData.ContractPeriod" placeholder="请输入" @change="dateChange"  style="width: 100%">
                 <template slot="append">(天)</template>
               </el-input>
             </el-form-item>
@@ -118,6 +118,7 @@
               <el-date-picker
                 v-model="formData.OpenDate"
                 type="date"
+                @change="dateChange"
                 placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
@@ -178,8 +179,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="币种" prop="Currency">
-              <el-input v-model="formData.Currency" placeholder="请输入"  style="width: 100%"></el-input>
+            <el-form-item label="币种">
+              <el-select v-model="formData.Currency"
+                         placeholder="请选择"
+                         style="width: 100%;">
+                <el-option v-for="item in dictionary.CurrencyType"
+                           :key="item.Value"
+                           :label="item.Key"
+                           :value="item.Value">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -600,6 +609,7 @@
         ContractClassDisabled:true,
         activeName: '1',
         serviceId: '',
+        CurrencyOptions: [],
         formData: {
           Id: '',
           SupplierId: '',
@@ -695,7 +705,16 @@
       this.statusFun()
     },
     methods: {
-      //状态判断
+      dateChange () {
+        if (this.formData.OpenDate && this.formData.ContractPeriod) {
+          var d = new Date(this.formData.OpenDate)
+          var dd = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate()
+          var ddd = new Date(dd)
+          console.log(ddd, this.formData.ContractPeriod, ddd.getDate() + parseInt(this.formData.ContractPeriod), '2222')
+          this.formData.PlanFinishDate = ddd.setDate(ddd.getDate() + parseInt(this.formData.ContractPeriod))
+        }
+      },
+      // 状态判断
       statusFun(){
         var data = {
           percode:'oil_contract_order',

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/index.vue

@@ -17,7 +17,7 @@
           </router-link> -->
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">导入</el-button> -->
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button>
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键处理</el-button>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键审批</el-button>
           <el-button type="info" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonDelete">取消</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index.vue

@@ -16,7 +16,7 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link> -->
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button> -->
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键处理</el-button>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="!selectAllButtonBoolean&&userSelectBoolean" @click="onSelectAllButton">一键审批</el-button>
           <el-button type="info" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonDelete">取消</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>