mo 4 éve
szülő
commit
f1e3c3db40

+ 5 - 1
src/views/businessManager/orderManager/orderAudit/index.vue

@@ -144,6 +144,7 @@
                         v-if="orderVisible"
                         @getList="getList" />
       <span slot="footer"
+            v-if="activeRow&&activeRow.auditStatus == 'ING'"
             class="dialog-footer">
         <el-button @click="submit('REJECT')">驳回</el-button>
         <el-button @click="submit('PASS')"
@@ -187,7 +188,8 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       orderVisible: false,
-      activceId: null
+      activceId: null,
+      activeRow: null
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
@@ -245,9 +247,11 @@ export default {
     },
     lookDetail (row) {
       this.activceId = row.id
+      this.activeRow = row
       this.orderVisible = true
     },
     submit (str) {
+
       this.$refs.orderAuditDetail.auditOutOrder(str)
     }
   }

+ 5 - 2
src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -167,8 +167,9 @@
 
     </el-form>
     <div class="lookTitle"
-         v-if="">审核意见</div>
+         v-if="auditStatus == 'ING'">审核意见</div>
     <el-form :model="submitForm"
+             v-if="auditStatus == 'ING'"
              ref="submitForm">
       <el-form-item prop="memo"
                     :rules=" [{ required: true, message:'请输入审核意见',trigger: 'blur'}]">
@@ -209,7 +210,8 @@ export default {
       cooperationList: [],
       submitForm: {
         memo: ''
-      }
+      },
+      auditStatus: ''
     }
   },
   mounted () {
@@ -232,6 +234,7 @@ export default {
             schoolId: orderInfo.schoolId,
             userId: orderInfo.userId
           }
+          this.auditStatus = orderInfo.auditStatus
           this.$set(this.form, 'goodsList', this.getShopList(orderInfo.goodsJson))
           console.log(this.form)
           this.changeOrgin(orderInfo.routeOrganId)

+ 1 - 1
vue.config.js

@@ -19,7 +19,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://dyme.utools.club' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
-// let target = 'http://192.168.3.248:8000' //邹璇
+// let target = 'http://192.168.3.30:8080' //邹璇
 // let target = 'http://192.168.3.204:8000' //勇哥
 let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔