Browse Source

备件申购修改查看审核流程显示

duanxiaoduan 1 year ago
parent
commit
d430829b8b
3 changed files with 26 additions and 19 deletions
  1. 2 2
      .env.development
  2. 0 0
      dist/index.html
  3. 24 17
      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.77:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.77: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/'

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 24 - 17
src/views/custom/subscribe/index.vue

@@ -264,20 +264,24 @@
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="价格" prop="price" align="center" min-width="150">
-            <template slot-scope="scope">
-              <div v-if="createTemp.providerId == ''" v-for="item in scope.row.pricearr">
-                <el-tooltip class="item" effect="dark" placement="top-start">
-                  <div slot="content">{{item}}</div>
-                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
-                </el-tooltip>
-              </div>
-              <el-form v-else :model="scope.row" :rules="rules">
-                <el-form-item prop="price">
-                  <el-input v-model="scope.row.price" style="margin-top:15px" />
-                </el-form-item>
-              </el-form>
-            </template>
+          <el-table-column v-if="createTemp.providerId == ''" label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div  v-for="item in scope.row.pricearr">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column v-else label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <el-form  :model="scope.row" :rules="rules">
+                <el-form-item prop="price">
+                  <el-input v-model="scope.row.price" style="margin-top:15px" />
+                </el-form-item>
+              </el-form>
+            </template>
           </el-table-column>
           <el-table-column label="使用周期" min-width="120px" align="center">
             <template slot-scope="scope">
@@ -1734,7 +1738,8 @@ export default {
             this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson }, { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson }, { title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }, { title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
             this.active = 6
           }
-        }else{
+        }else{
+          console.log('wolai')
           if (this.seeTemp.statue === 2) {
             this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核' },{ title: '设备主管审核' }, { title: '供应主管审核' },{ title: '采购审核' }]
             this.active = 1
@@ -1760,7 +1765,7 @@ export default {
               this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson }, { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson   }, { title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }, { title: '采购审核' }]
               this.active = 4
           } else if (this.seeTemp.statue === 12) {
-            this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson }, { title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson  }, { title: '采购审核' }]
+            this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson }, { title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson,status: 'error', reason: reason  }, { title: '采购审核' }]
             this.active = 4
           } else if (this.seeTemp.statue === 7) {
             this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson }, { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson }, { title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson }]
@@ -2254,7 +2259,9 @@ export default {
       this.statueReason = false
     },
     createExamineData3() {
-      console.log('点击了供应主管审核')
+      console.log('点击了供应主管审核',this.examineTemp.statue)
+
+      console.log(this.examineTemp.purchase_type,'=====')
       console.log(this.isApplyEx4,'=====')
       this.isokDisable = true
       setTimeout(() => {

Some files were not shown because too many files changed in this diff