工单提交修改

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReview.go

@@ -71,6 +71,7 @@ type OilContractReviewVo struct {
 	Items []*OilContractEvaluationItemsVo
 	Id             int       `json:"Id" xorm:"not null pk INT(11) 'Id'"`
 	ContractId     int       `json:"ContractId" xorm:"not null comment('合同表Id') INT(11) 'ContractId'"`
+	IsFinal        int       `json:"IsFinal" xorm:"not null comment('是否最终评价（履行完成） 0否1是') INT(11) 'IsFinal'"`
 	Status         string    `xorm:"not null default '0' VARCHAR(10)"`
 	WorkflowId     string    `json:"WorkflowId" xorm:"default '0' comment('工作流的ID') VARCHAR(50) 'WorkflowId'"`
 	BusinessKey    string    `json:"BusinessKey" xorm:"comment('流程序号') VARCHAR(255) 'BusinessKey'"`

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

@@ -164,6 +164,7 @@ func (this *OilContractReviewController) AddEntity() {
 	svc := contractReview.GetOilContractReviewService(utils.DBE)
 	itemSvc := contractEvaluationItems.GetOilContractEvaluationItemsService(utils.DBE)
 	var reviewMode contractReview.OilContractReview
+	reviewMode.IsFinal = modeVO.IsFinal
 	reviewMode.ContractId = modeVO.ContractId
 	reviewMode.Status = "0"
 	reviewMode.Unit = this.User.Unit

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

@@ -166,7 +166,7 @@
                 <el-option key="4" label="待专业科室审核" value="4"></el-option>
                 <el-option key="5" label="待集中评审" value="5"></el-option>
                 <el-option key="6" label="待交费" value="6"></el-option>
-                <el-option key="7" label="待入库" value="7"></el-option>
+                <el-option key="7" label="待企管审批" value="7"></el-option>
                 <el-option key="8" label="完成" value="8"></el-option>
                 <el-option key="9" label="审核未通过" value="9"></el-option>
               </el-select>

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

@@ -161,6 +161,8 @@
 
     data() {
       return {
+        IsFinal:0,
+
         routeData:{},//上一页面传过来的值
         routeDataType:'',//上一页面传过来的type
 
@@ -211,6 +213,9 @@
       this.serviceId = this.$route.params.opera;
       // this.getDictOptions();
 
+      this.IsFinal   = this.$route.query.IsFinal;
+      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0; 
+
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         // this.initDatas();
@@ -349,7 +354,7 @@
         var formData = {
           ContractId:this.contractData.Id,
           Items:this.evaluation_list,
-          IsFinal:0,//是否履行，最终
+          IsFinal:this.IsFinal,           //是否履行，最终
         }
         api.addContractEvaluate(formData, this.$axios).then(res => {
           console.log('新增',res)

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

@@ -121,14 +121,14 @@
           <el-col :span="12">
             <el-form-item label="状态">
               <el-select v-model="searchForm.Status" placeholder="请选择" >
-                <el-option key="0" label="初始" value="0"></el-option>
+                <el-option key="0" label="已保存" value="0"></el-option>
                 <el-option key="1" label="待二级初审" value="1"></el-option>
                 <el-option key="2" label="待二级复审" value="2"></el-option>
                 <el-option key="3" label="专业科室接收" value="3"></el-option>
                 <el-option key="4" label="待专业科室审核" value="4"></el-option>
                 <el-option key="5" label="待集中评审" value="5"></el-option>
                 <el-option key="6" label="待交费" value="6"></el-option>
-                <el-option key="7" label="待入库" value="7"></el-option>
+                <el-option key="7" label="待企管审批" value="7"></el-option>
                 <el-option key="8" label="完成" value="8"></el-option>
                 <el-option key="9" label="审核未通过" value="9"></el-option>
               </el-select>

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

@@ -161,6 +161,8 @@
 
     data() {
       return {
+        IsFinal:0,
+
         routeData:{},//上一页面传过来的值
         routeDataType:'',//上一页面传过来的type
 
@@ -211,6 +213,10 @@
       this.serviceId = this.$route.params.opera;
       // this.getDictOptions();
 
+      this.IsFinal   = this.$route.query.IsFinal;
+      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0; 
+
+
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         // this.initDatas();
@@ -349,7 +355,7 @@
         var formData = {
           ContractId:this.contractData.Id,
           Items:this.evaluation_list,
-          IsFinal:0,//是否履行，最终
+          IsFinal:this.IsFinal,           //是否履行，最终
         }
         api.addContractEvaluate(formData, this.$axios).then(res => {
           console.log('新增',res)

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

@@ -433,10 +433,33 @@
     methods: {
       //合同完结
       onFinish(){
+
+         var index = (this.formData.ContractClass)
+
         api.contractOrderFinish(this.formData.Id, this.$axios).then(res => {
           console.log('完结成功',res)
           if(res.data.code==0){
-            this.$message({message: res.data.message,type: 'success'});
+            //this.$message({message: res.data.message,type: 'success'});
+            var name = ''
+            switch(index){
+              case "01":
+                name = 'contract-goods'
+              break;
+              case "02":
+                name = 'contract-basis'
+              break;
+              case "03":
+                name = 'contract-service'
+              break;
+            }
+            this.$router.push({
+              path:'/oilcontract/' + name + '/add/evaluate',
+              query:{
+                item:this.formData,
+                IsFinal:1
+                // type:1,
+              }
+            })
           }else{
             this.$message({message: res.data.message,type: 'error'});
           }

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

@@ -143,7 +143,7 @@
                 <el-option key="4" label="待专业科室审核" value="4"></el-option>
                 <el-option key="5" label="待集中评审" value="5"></el-option>
                 <el-option key="6" label="待交费" value="6"></el-option>
-                <el-option key="7" label="待入库" value="7"></el-option>
+                <el-option key="7" label="待企管审批" value="7"></el-option>
                 <el-option key="8" label="完成" value="8"></el-option>
                 <el-option key="9" label="审核未通过" value="9"></el-option>
               </el-select>

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

@@ -161,6 +161,7 @@
 
     data() {
       return {
+        IsFinal:0,
         routeData:{},//上一页面传过来的值
         routeDataType:'',//上一页面传过来的type
 
@@ -211,6 +212,11 @@
       this.serviceId = this.$route.params.opera;
       // this.getDictOptions();
 
+      this.IsFinal   = this.$route.query.IsFinal;
+
+      console.log('跳转数据2',this.$route.query)
+      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0; 
+
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         // this.initDatas();
@@ -350,7 +356,7 @@
         var formData = {
           ContractId:this.contractData.Id,
           Items:this.evaluation_list,
-          IsFinal:0,//是否履行，最终
+          IsFinal:this.IsFinal,           //是否履行，最终
         }
         api.addContractEvaluate(formData, this.$axios).then(res => {
           console.log('新增',res)