Merge branch 'dev_v2' of https://gogs.zfire.top/zfire-front/supply-front into dev_v2

src/views/supply/apply/apply_list.vue

@@ -11,6 +11,7 @@
       :operationColumnWidth="200"
       :columnParsing="columnParsing"
       :optionsEvensGroup="optionsEvensGroup"
+      :replaceOrNotMap="false"
     >
     </template-page>
     <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" />
@@ -241,19 +242,20 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
+        console.log(row)
         return (
           <div class="operation-btns">
             {this.$checkBtnRole('apply', this.$route.meta.roles) &&
             ((!this.isCustomer &&
               !row.automaticStatus &&
-              (row.examineStatus === '保存' || row.examineStatus === '不通过')) ||
+              (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL')) ||
               (this.isCustomer &&
                 !row.automaticStatus &&
-                (row.examineStatus === '保存' || row.examineStatus === '不通过') &&
+                (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL') &&
                 row.type != 2) ||
               (!this.isCustomer &&
                 row.automaticStatus &&
-                (row.examineStatus === '保存' || row.examineStatus === '不通过') &&
+                (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL') &&
                 row.type === 2)) ? (
               <el-popconfirm
                 style="margin-right: 10px"
@@ -269,9 +271,9 @@ export default {
             ) : null}
 
             {this.$checkBtnRole('apply', this.$route.meta.roles) &&
-            ((!this.isCustomer && !row.automaticStatus && row.examineStatus === '待审核') ||
-              (this.isCustomer && !row.automaticStatus && row.examineStatus === '待审核' && row.type != 2) ||
-              (!this.isCustomer && row.automaticStatus && row.examineStatus === '待审核' && row.type == 2)) ? (
+            ((!this.isCustomer && !row.automaticStatus && row.examineStatus === 'WAIT') ||
+              (this.isCustomer && !row.automaticStatus && row.examineStatus === 'WAIT' && row.type != 2) ||
+              (!this.isCustomer && row.automaticStatus && row.examineStatus === 'WAIT' && row.type == 2)) ? (
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定撤回吗？"
@@ -285,9 +287,9 @@ export default {
               </el-popconfirm>
             ) : null}
             {this.$checkBtnRole('examine', this.$route.meta.roles) &&
-            ((!this.isCustomer && !row.automaticStatus && row.examineStatus === '通过') ||
-              (this.isCustomer && !row.automaticStatus && row.examineStatus === '通过' && row.type != 2) ||
-              (!this.isCustomer && row.automaticStatus && row.examineStatus === '通过' && row.type == 2)) ? (
+            ((!this.isCustomer && !row.automaticStatus && row.examineStatus === 'OK') ||
+              (this.isCustomer && !row.automaticStatus && row.examineStatus === 'OK' && row.type != 2) ||
+              (!this.isCustomer && row.automaticStatus && row.examineStatus === 'OK' && row.type == 2)) ? (
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定弃审吗？"
@@ -303,7 +305,7 @@ export default {
 
             {this.$checkBtnRole('edit', this.$route.meta.roles) &&
             !row.automaticStatus &&
-            (row.examineStatus === '保存' || row.examineStatus === '不通过') &&
+            (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL') &&
             row.type === 1 ? (
               <el-button
                 type="text"
@@ -317,16 +319,16 @@ export default {
             {this.$checkBtnRole('edit', this.$route.meta.roles) &&
             ((!this.isCustomer &&
               !row.automaticStatus &&
-              (row.examineStatus === '保存' || row.examineStatus === '不通过') &&
+              (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL') &&
               row.type === 2) ||
               (this.isCustomer &&
                 !row.automaticStatus &&
-                (row.examineStatus === '保存' || row.examineStatus === '不通过') &&
+                (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL') &&
                 row.type != 2 &&
                 row.type !== 1) ||
               (!this.isCustomer &&
                 row.automaticStatus &&
-                (row.examineStatus === '保存' || row.examineStatus === '不通过') &&
+                (row.examineStatus === 'SAVE' || row.examineStatus === 'FAIL') &&
                 row.type === 2)) ? (
               <el-button
                 type="text"
@@ -339,9 +341,9 @@ export default {
             ) : null}
 
             {this.$checkBtnRole('examine', this.$route.meta.roles) &&
-            ((!this.isCustomer && !row.automaticStatus && row.examineStatus === '待审核') ||
-              (this.isCustomer && !row.automaticStatus && row.examineStatus !== '待审核' && row.type != 2) ||
-              (!this.isCustomer && row.automaticStatus && row.examineStatus === '待审核' && row.type == 2)) ? (
+            ((!this.isCustomer && !row.automaticStatus && row.examineStatus === 'WAIT') ||
+              (this.isCustomer && !row.automaticStatus && row.examineStatus !== 'WAIT' && row.type != 2) ||
+              (!this.isCustomer && row.automaticStatus && row.examineStatus === 'WAIT' && row.type == 2)) ? (
               <el-button
                 type="text"
                 onClick={() => {
@@ -353,9 +355,9 @@ export default {
             ) : null}
 
             {this.$checkBtnRole('del', this.$route.meta.roles) &&
-            ((!this.isCustomer && !row.automaticStatus && row.examineStatus !== '通过') ||
-              (this.isCustomer && !row.automaticStatus && row.examineStatus !== '通过' && row.type != 2) ||
-              (!this.isCustomer && row.automaticStatus && row.examineStatus !== '通过' && row.type == 2)) ? (
+            ((!this.isCustomer && !row.automaticStatus && row.examineStatus !== 'OK') ||
+              (this.isCustomer && !row.automaticStatus && row.examineStatus !== 'OK' && row.type != 2) ||
+              (!this.isCustomer && row.automaticStatus && row.examineStatus !== 'OK' && row.type == 2)) ? (
               <el-popconfirm
                 style="margin-left: 10px"
                 title="确定删除吗？"

src/views/supply/deliver/deliver_list.vue

@@ -9,6 +9,7 @@
       :operationColumnWidth="200"
       :columnParsing="columnParsing"
       :optionsEvensGroup="optionsEvensGroup"
+      :replaceOrNotMap="false"
     >
     </template-page>
     <!-- 密码记录 -->

src/views/supply/engin/components/engin_form.vue

@@ -964,7 +964,7 @@ export default {
               editEngin(params).then(res => {
                 this.$successMsg('编辑成功')
                 this.goBack()
-                this.$parent.getList()
+                // this.$parent.getList()
               })
             } else {
               params.customerNumber = this.mainForm.jxsNum
@@ -973,7 +973,7 @@ export default {
               addEngin(params).then(res => {
                 this.$successMsg('保存成功')
                 this.goBack()
-                this.$parent.getList()
+                // this.$parent.getList()
               })
             }
           } else {
@@ -987,7 +987,7 @@ export default {
             submitEngin(params).then(res => {
               this.$successMsg('提交审核成功')
               this.goBack()
-              this.$parent.getList()
+              // this.$parent.getList()
             })
           }
         }

src/views/supply/engin/engin_list.vue

@@ -439,6 +439,7 @@ export default {
       this.isShowForm = false
       this.isShowExamine = false
       this.showPage = true
+      this.$refs.pageRef.refreshList()
     },
 
     // 申请