Parcourir la source

增加提交前自动保存

王宇昕 il y a 5 ans
Parent
commit
7d02ebcc1b

+ 2 - 0
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year/_opera/operation.vue

@@ -511,6 +511,7 @@ export default {
       switch (index) {
         // 提交审核
         case 0:
+          this.saveEntity();
           this.$refs.submitpopup.dialogVisibleCom = true
           break;
         // 初审
@@ -528,6 +529,7 @@ export default {
           break;
         // 专业处室审核
         case 4:
+          this.saveEntity();
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
         // 企管法规处

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/baselist.vue

@@ -150,6 +150,7 @@ export default {
         Type: 2,
       }
       api.contractEvaluationTree(data, this.$axios).then(res => {
+          console.log(6666,res)
         let data = res.data.items
         let list = []
         if (data) {

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

@@ -361,6 +361,7 @@ export default {
       switch (index) {
         //  提交审核
         case 0:
+          this.onSeaveBigAdd();
           this.$refs['submitpopup'].dialogVisibleCom = true
           console.log(this.$refs['submitpopup'].dialogVisibleCom, this.$refs.submitpopup.dialogVisibleCom, 'dialogVisibleCom')
           break
@@ -396,7 +397,6 @@ export default {
         }
         //  获取第一列评价格式
         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('业绩评价填写的分数不能大于标准分值')
@@ -417,7 +417,6 @@ export default {
       } else { // 专业处室评价
         this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
         let list = this.evaluation_list
-        console.log('2222222222222222222222222222222')
         for (let i = 0; i < list.length; i++) {
           if (Number(list[i].Score) > Number(list[i].NormalScore)) {
             this.$message.error('业绩评价填写的分数不能大于标准分值')

+ 2 - 0
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/_opera/operation.vue

@@ -455,6 +455,7 @@ export default {
       switch (index) {
         // 提交审核
         case 0:
+          this.saveEntity();
           this.$refs.submitpopup.dialogVisibleCom = true
           break;
         // 初审
@@ -472,6 +473,7 @@ export default {
           break;
         // 专业处室审核
         case 4:
+          this.saveEntity();
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
         // 企管法规处

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

@@ -360,6 +360,7 @@ export default {
       switch (index) {
         // 提交审核
         case 0:
+          this.onSeaveBigAdd();
           this.$refs.submitpopup.dialogVisibleCom = true
           break;
         // 初审
@@ -377,6 +378,7 @@ export default {
           break;
         // 专业处室审核
         case 4:
+          this.onSeaveBigAdd();
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
         // 企管法规处

+ 4 - 4
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/index.vue

@@ -44,7 +44,7 @@
             </router-link>
 
             <!-- v-model=" deleteConfirmFlagIndex==scope.row.$index" -->
-            <el-popover placement="top" title="提示" width="160" content="确认要删除吗?" :ref="'popover-' + `${scope.$index}`">
+            <el-popover placement="top" title="提示" :width="160" content="确认要删除吗?" :ref="'popover-' + `${scope.$index}`">
               <!-- :closable="false" -->
               <el-alert
                 title=""
@@ -59,12 +59,12 @@
               </div>
               <el-button slot="reference" type="text" v-if="deleteBoolean" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
             </el-popover>
-            <el-button type="text" size="small" :disabled="!evaluateBoolean || scope.row.Status === 3" style="margin-left:3px"  icon="el-icon-edit-outline" @click="onNavigateEvaluate(scope.row)">评价</el-button>
+            <el-button type="text" size="small" :disabled="!evaluateBoolean || scope.row.Status === 3" style="margin-left:3px"  icon="el-icon-edit-outline  " @click="onNavigateEvaluate(scope.row)">评价</el-button>
           </template>
         </el-table-column>
 
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="140" :label="column.label" align="center" show-overflow-tooltip>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :min-width="140" :label="column.label" align="center" show-overflow-tooltip>
                          <template slot-scope="scope">
                            <div>{{tableFun(column.prop,scope.row[column.prop])}}</div>
                          </template>
@@ -332,7 +332,7 @@
       <el-form label-width="100px">
         <el-row>
           <el-col :span="24">
-            <el-upload limit="1" style="margin-top: 10px;" action="" ref="refuploadattach"
+            <el-upload :limit="1" style="margin-top: 10px;" action="" ref="refuploadattach"
                        :http-request="uploadrequest" :before-remove="beforeRemove">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>

+ 2 - 0
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year/_opera/operation.vue

@@ -441,6 +441,7 @@ export default {
       switch (index) {
         // 提交审核
         case 0:
+          this.saveEntity();
           this.$refs.submitpopup.dialogVisibleCom = true
           break;
         // 初审
@@ -458,6 +459,7 @@ export default {
           break;
         // 专业处室审核
         case 4:
+          this.saveEntity();
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
         // 企管法规处

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

@@ -364,6 +364,7 @@ export default {
       switch (index) {
         // 提交审核
         case 0:
+          this.onSeaveBigAdd();
           this.$refs.submitpopup.dialogVisibleCom = true
           break;
         // 初审
@@ -381,6 +382,7 @@ export default {
           break;
         // 专业处室审核
         case 4:
+          this.onSeaveBigAdd();
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
         // 企管法规处