Explorar el Código

feat: 修改按钮判断

aXin-0810 hace 2 años
padre
commit
ef2983c5da
Se han modificado 2 ficheros con 4 adiciones y 5 borrados
  1. 1 2
      .env.development
  2. 3 3
      src/views/supply/apply/engin_list.vue

+ 1 - 2
.env.development

@@ -3,6 +3,5 @@ ENV = 'development'
 
 # base api
 # 121.43.111.127 192.168.31.6
-#VUE_APP_BASE_API = 'http://127.0.0.1:10005/'
 VUE_APP_BASE_API = 'http://121.43.111.127:10005/'
-#VUE_APP_BASE_API = 'http://hg.zfire.top/api/'
+# VUE_APP_BASE_API = 'https://gyl.greeapps.com/supply_api/'

+ 3 - 3
src/views/supply/apply/engin_list.vue

@@ -11,8 +11,8 @@
     :operationColumnWidth="200"
     :replaceOrNotMap="false"
   >
-      <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm"  @submit="submitExamineForm"/>
-  
+    <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" @submit="submitExamineForm" />
+
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturnForm">
       <EnginDetail v-if="isShowDetail" ref="refDetail" :list-item="queryItem" @backListFormDetail="backList" />
       <EnginExamine v-if="isShowExamine" :list-item="queryItem" @backListFormDetail="backList" />
@@ -399,7 +399,7 @@ export default {
             {this.$checkBtnRole('del', this.$route.meta.roles) &&
             ((!this.isCustomer && !row.automaticStatus && row.examineStatus !== 'OK') ||
               (this.isCustomer && !row.automaticStatus && row.examineStatus !== 'OK' && row.type != 2) ||
-              (!this.isCustomer && row.automaticStatus && row.examineStatus !== 'OK' && scope.row.type == 2)) ? (
+              (!this.isCustomer && row.automaticStatus && row.examineStatus !== 'OK' && row.type == 2)) ? (
               <el-popconfirm
                 onOnConfirm={async () => {
                   this.handleDelete(row.id)