Просмотр исходного кода

修改了备件申购采购审核权限bug

duanxiaoduan 6 месяцев назад
Родитель
Сommit
c773c0de7c
3 измененных файлов с 5 добавлено и 5 удалено
  1. 2 2
      .env.development
  2. 0 0
      dist/index.html
  3. 3 3
      src/views/custom/subscribe/index.vue

+ 2 - 2
.env.development

@@ -7,9 +7,9 @@ ENV = 'development'
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 #  白少后台本地
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
+VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
 # 线上测试
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/index.html


+ 3 - 3
src/views/custom/subscribe/index.vue

@@ -104,7 +104,7 @@
           <el-button v-else-if="sdchangzhangshenhe  && row.statue == 5 && row.departmentName !== '挤奶处'" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">审核</el-button>
 
           <!-- 采购 -->
-          <el-button v-if="isSubscribeExamineCG && (row.departmentName == '挤奶处' && row.statue == 15 ) || (row.departmentName !== '挤奶处' && row.statue == 11) " style="display:inline-block" type="success" size="mini" @click="handleExamine5(row)">审核</el-button>
+          <el-button v-if="isSubscribeExamineCG && ((row.departmentName == '挤奶处' && row.statue == 15 ) || (row.departmentName !== '挤奶处' && row.statue == 11) )" style="display:inline-block" type="success" size="mini" @click="handleExamine5(row)">审核</el-button>
 
           <!-- 财务 -->
           <el-button v-if="isSubscribeExamineCW && row.purchase_type > 0 && row.statue == 7" style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核</el-button>
@@ -738,7 +738,7 @@
 
 
                 <!-- 采购 -->
-                <el-button v-if="isSubscribeExamineCG && seeTemp.statue == 11 && (seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) " type="success" style="display:inline-block" @click="handleExamine5(row)">审核</el-button>
+                <el-button v-if="isSubscribeExamineCG && ((seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) )" type="success" style="display:inline-block" @click="handleExamine5(row)">审核</el-button>
 
                 <!-- 财务 -->
                 <el-button v-if="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核</el-button>
@@ -1049,7 +1049,7 @@
                 <el-button v-else-if=" sdchangzhangshenhe  && seeTemp.statue == 5 && seeTemp.departmentName !== '挤奶处'" type="success" style="display:inline-block" @click="handleExamine4(row)">审核</el-button>
 
                 <!-- 采购 -->
-                <el-button v-if="isSubscribeExamineCG && seeTemp.statue == 11 && (seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) " type="success" style="display:inline-block" @click="handleExamine5(row)">审核</el-button>
+                <el-button v-if="isSubscribeExamineCG &&( (seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) )" type="success" style="display:inline-block" @click="handleExamine5(row)">审核</el-button>
                 <!-- 财务 -->
                 <el-button v-if="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" @click="handleExamine6(row)">审核</el-button>
                 <!-- 奶厅 -->

Некоторые файлы не были показаны из-за большого количества измененных файлов