Merge branch 'feature/add-subscribe' of Epans/modernDairy into master

.env.development

@@ -6,9 +6,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://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 

src/views/cost/diesel/index.vue

@@ -28,7 +28,7 @@
           <el-button v-if="isRetreatImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
         </el-upload>
         <el-button v-if="isDieselExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">数据导出</el-button>
-        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
+        <!-- <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button> -->
       </div>
     </div>
 
@@ -766,20 +766,19 @@ export default {
     handleImportExcelSuccess(res, file) {
     //  if (res.msg === 'ok') {
       if (res.msg === 'ok') {
-        this.$message({
-          title: '成功',
-          message: '导入成功',
-          type: 'success',
-          duration: 2000
-        })
         if (res.data.err_count > 0) {
+          this.$message({
+            title: '失败',
+            message: '导入失败',
+            type: 'danger',
+            duration: 2000
+          })
           this.$notify({
             title: '失败',
             message: '导入失败',
             type: 'danger',
             duration: 2000
           })
-
            import('@/vendor/Export2Excel').then(excel => {
              const list1 = res.data.result
              const tHeader = [
@@ -797,6 +796,19 @@ export default {
                bookType: 'xlsx'
              })
            })
+        }else{
+          this.$message({
+            title: '成功',
+            message: '导入成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.$notify({
+            title: '成功',
+            message: '导入成功',
+            type: 'success',
+            duration: 2000
+          })
         }
       } else {
         this.$notify({

src/views/custom/contractManagement/index.vue

@@ -136,7 +136,8 @@
             <el-table-column label="计量单位" min-width="120px" align="center" prop="unit" />
             <el-table-column label="计划量" sortable min-width="120px" align="center" prop="planAmount" />
             <el-table-column label="单价" sortable min-width="120px" align="center" prop="price" />
-            <el-table-column label="备注" min-width="120px" align="center" prop="remark" />
+            <!-- <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
+            <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" /> -->
           </el-table>
           <pagination v-show="tab1.detailsSpareParts.total>0" :total="tab1.detailsSpareParts.total" :page.sync="tab1.detailsSpareParts.getdataListParm.offset" :limit.sync="tab1.detailsSpareParts.getdataListParm.pagecount" @pagination="getTab1List2" />
         </div>
@@ -535,16 +536,16 @@
               <el-input v-model="scope.row.price" />
             </template>
           </el-table-column>
-          <el-table-column label="税码" min-width="80px" align="center" valign="middle">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.taxcode" />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" min-width="110px" align="center">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.remark" type="textarea" placeholder="备注" autosize maxlength="100" show-word-limit />
-            </template>
-          </el-table-column>
+          <!-- <el-table-column label="使用周期" min-width="110px" align="center" valign="middle">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.lifeCycle" />
+              </template>
+            </el-table-column>
+            <el-table-column label="合同差异项" min-width="110px" align="center" valign="middle">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.contractVarianceItem" />
+              </template>
+            </el-table-column> -->
           <el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
               <a class="del" :disabled="isokDisable" @click="partDelete(row)">删除</a>
@@ -2198,7 +2199,9 @@ export default {
           remark: '@insertSpotList.remark',
           unit: '@insertSpotList.unit',
           contractId: '@insertSpotList.contractId',
-          taxcode: '@insertSpotList.taxcode'
+          taxcode: '@insertSpotList.taxcode',
+          // lifeCycle: '@insertSpotList.lifeCycle',
+          // contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -2287,7 +2290,9 @@ export default {
           remark: '@insertSpotList.remark',
           unit: '@insertSpotList.unit',
           contractId: '@insertSpotList.contractId',
-          taxcode: '@insertSpotList.taxcode'
+          taxcode: '@insertSpotList.taxcode',
+          // lifeCycle: '@insertSpotList.lifeCycle',
+          // contractVarianceItem: '@insertSpotList.contractVarianceItem',
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -2584,7 +2589,9 @@ export default {
               remark: '@insertSpotList.remark',
               unit: '@insertSpotList.unit',
               contractId: '@insertSpotList.contractId',
-              taxcode: '@insertSpotList.taxcode'
+              taxcode: '@insertSpotList.taxcode',
+              // lifeCycle: '@insertSpotList.lifeCycle',
+              // contractVarianceItem: '@insertSpotList.contractVarianceItem',
             }}
           } else {
             this.postDataPramas.data[1].children[0] = { 'name': 'checkcontracPartCode', 'type': 'v', 'parammaps': { pastureId: this.tab1.detailsSpareParts.detailsList.pastureId, providerId: this.tab1.detailsSpareParts.detailsList.providerId, stopTime: this.tab1.detailsSpareParts.detailsList.stopTime, flag: this.tab1.detailsSpareParts.detailsList.flag, isZeroStock: this.tab1.detailsSpareParts.detailsList.isZeroStock, statue: this.tab1.detailsSpareParts.detailsList.statue, partCode: '@insertSpotList.partCode', brandId: '@insertSpotList.brandId' }}
@@ -2603,6 +2610,8 @@ export default {
               remark: '@insertSpotList.remark',
               unit: '@insertSpotList.unit',
               contractId: '@insertSpotList.contractId',
+              // lifeCycle: '@insertSpotList.lifeCycle',
+              // contractVarianceItem: '@insertSpotList.contractVarianceItem',
               // taxcode: '@insertSpotList.taxcode'
             }}
           }

src/views/custom/outStock/index.vue

@@ -6,6 +6,8 @@
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="备件出库" name="first">
+        <!-- <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="handleDescription" /> -->
+        <div class="el-icon-info" style="font-size: 30px;float: right;color: #409EFF;" @click="handleDescription"/>
         <div class="filter-container">
           <el-select v-model="getdataListParm.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item" @change="changePastureName">
             <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
@@ -1021,6 +1023,24 @@
         <el-button @click="easStatus.dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="textMap[description.dialogStatus]" :destroy-on-close="true" :visible.sync="description.dialogFormVisible" :close-on-click-modal="false" width="70%">
+        <b style="line-height: 28px;">常见问题1：出库保存报错</b>
+        <br>
+      <div class="app-description dialogMinHeight">
+        <div class="content">
+          报错原因1: 请求超时
+          <br>
+          报错原因2：牧场在SAP已出库
+          <br>
+          解决方案：请在SAP冲销相应的未同步的出库。
+          <br>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="cancelClose" @click="description.dialogFormVisible = false; ">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1167,7 +1187,8 @@ export default {
         see: '查看详情',
         update: '编辑',
         create: '新增',
-        easStatus: 'EAS同步—同步失败数据'
+        easStatus: 'EAS同步—同步失败数据',
+        description: '常见问题说明'
       },
       getdataListParm: {
         name: 'getBigPartuseList',
@@ -1333,7 +1354,11 @@ export default {
             pastureid: Cookies.get('pastureid')
           }
         }
-      }
+      },
+      description: {
+        dialogFormVisible: false,
+        dialogStatus: ''
+      },
     }
   },
   computed: {
@@ -3259,8 +3284,11 @@ export default {
       }).catch(() => {
         this.$message({ type: 'info', message: '已取消忽略同步' })
       })
+    },
+    handleDescription() {
+      this.description.dialogStatus = 'description'
+      this.description.dialogFormVisible = true
     }
-
   }
 }
 </script>
@@ -3288,5 +3316,11 @@ export default {
   .el-form-item__content{
     line-height: 0;
   }
+  .app-description{
+    display:flex; justify-content: left; align-items: left;font-size: 14px;line-height: 28px;height: 300px;
+    .content{
+      display:flex;
+    }
+  }
 
 </style>

src/views/custom/subscribe/index.vue

@@ -330,6 +330,8 @@
               <el-input v-model="scope.row.purpose" />
             </template>
           </el-table-column>
+          <!-- <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
+          <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" /> -->
           <el-table-column
             label="操作"
             align="center"
@@ -387,8 +389,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="申购日期：" prop="createTime">
-                <el-date-picker v-model="seeTemp.createTime" :picker-options="pickerOptions" type="date" placeholder="申购日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" disabled />
+              <el-form-item label="申购日期：" prop="inputTime">
+                <el-date-picker v-model="seeTemp.inputTime" :picker-options="pickerOptions" type="date" placeholder="申购日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8" v-if="seeTemp.purchaseType == '2'">
@@ -473,11 +475,9 @@
           <el-table-column label="现有库存" sortable prop="storageAmount" align="center" min-width="60" />
           <el-table-column label="价格" sortable prop="price" align="center" min-width="60" />
           <el-table-column label="申购数量" sortable prop="amount" align="center" min-width="60" />
-          <el-table-column label="备注" min-width="110px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.purpose }}</span>
-            </template>
-          </el-table-column>
+          <!-- <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
+          <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" /> -->
+          <el-table-column label="备注" min-width="110px" align="center" prop="purpose" />
         </el-table>
         <el-form
           ref="seeTemp"
@@ -667,7 +667,7 @@ export default {
       textMap: {
         update: '编辑',
         create: '新增',
-        see: '查看/特殊申购l',
+        see: '查看',
         examine1: '审核1',
         examine2: '审核2',
         examine3: '审核3',
@@ -803,6 +803,7 @@ export default {
         }
       },
       apply_subscribeData:{},
+      isApplyEx4:true,
       myHeight:document.documentElement.clientHeight - 85- 150
     }
   },
@@ -1386,6 +1387,12 @@ export default {
     },
     // 查看
     form_see(row) {
+      // 查看/特殊申购
+      if(row.purchase_type == 1 || row.purchase_type == 3){
+        this.textMap.see = '特殊申购'
+      }else{
+        this.textMap.see = '查看'
+      }
       this.dialogStatus = 'see'
       this.dialogFormVisibleSee = true
       this.seeTemp = Object.assign({}, row)
@@ -1393,13 +1400,14 @@ export default {
       console.log('查看上方数据(从table读取)', this.seeTemp)
       this.listSee = []
       this.getdataListSee.parammaps.id = this.seeTemp.id
+      this.isApplyEx4 = false
       this.getSeeList()
+    },
+    getFlowPath(){
       // 流程图
       var reason = '未通过原因:' + this.seeTemp.workflowNote
-
-
-
       if (this.seeTemp.purchase_type < 0 || this.seeTemp.purchase_type == 0 ) {
+        if(this.isApplyEx4 == true){
           if (this.seeTemp.statue === 2) {
             this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核' },{ title: '设备主管审核' }, { title: '供应主管审核' }, { title: '场长审核' },{ title: '采购审核' }]
             this.active = 1
@@ -1422,8 +1430,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, status: 'error', reason: reason }, { title: '场长审核' }, { title: '采购审核' }]
             this.active = 4
           }  else if (this.seeTemp.statue === 11) {
-            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: '采购审核' }]
-            this.active = 5
+              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: '采购审核' }]
+              this.active = 5
           } 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: '场长审核' , date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson, status: 'error', reason: reason }, { title: '采购审核' }]
             this.active = 5
@@ -1435,11 +1443,46 @@ 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{
+          if (this.seeTemp.statue === 2) {
+            this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核' },{ title: '设备主管审核' }, { title: '供应主管审核' },{ title: '采购审核' }]
+            this.active = 1
+          } else if (this.seeTemp.statue === 3) {
+            this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },{ title: '设备主管审核' }, { title: '供应主管审核' },  { title: '采购审核' }]
+            this.active = 2
+          } else if (this.seeTemp.statue === 4) {
+            this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson, status: 'error', reason: reason },{ title: '设备主管审核' }, { title: '供应主管审核' }, { title: '采购审核' }]
+            this.active = 2
+          } else if (this.seeTemp.statue === 9) {
+            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: '供应主管审核' }, { title: '采购审核' }]
+            this.active = 3
+          } else if (this.seeTemp.statue === 10) {
+            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, status: 'error', reason: reason  }, { title: '供应主管审核' }, { title: '采购审核' }]
+            this.active = 3
+          }  else if (this.seeTemp.statue === 5) {
+            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 === 6) {
+            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 === 11) {
+              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.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 }]
+            this.active = 6
+          } else if (this.seeTemp.statue === 8) {
+            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, status: 'error', reason: reason }]
+            this.active = 6
+          }
+        }
       } else if(this.seeTemp.purchase_type == 3){
         this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }]
         this.active = 1
       }else {
-        // 待写
         if (this.seeTemp.statue === 2) {
           this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核' },{ title: '设备主管审核' }, { title: '供应主管审核' }, { title: '财务审核' },{ title: '场长审核' },{ title: '采购审核' }]
           this.active = 1
@@ -1481,15 +1524,44 @@ export default {
           this.active = 7
         }
       }
-
-
     },
     getSeeList() {
+      this.listLoadingSee = true
       GetDataByName(this.getdataListSee).then(response => {
         if (response.data.list !== null) {
           console.log('查看下方table数据', response.data.list)
           this.listSee = response.data.list
           this.listAdd = response.data.list
+          var sumPrices = 0
+          response.data.list.forEach(function(i,j){
+            sumPrices = sumPrices + (parseFloat(i.price1) *parseFloat(i.amount) )
+          })
+          console.log("总价sumPrices",sumPrices)
+          var priceObj = false
+          var priceArr = []
+          response.data.list.forEach(function(i,j){
+            if(parseFloat(i.price1) >= 500){
+              priceArr.push(true)
+            }else{
+              priceArr.push(false)
+            }
+          })
+
+          if (priceArr.includes(true)) {
+            priceObj = true
+          } else {
+            priceObj = false
+          }
+          console.log("priceObj",priceObj)
+          //总价大于2000 或单价>500
+          if(sumPrices >= 2000 || priceObj){
+            this.isApplyEx4 = true
+            this.getFlowPath()
+          } else {
+            this.isApplyEx4 = false
+            this.getFlowPath()
+          }
+
           for (let i = 0; i < response.data.list.length; i++) {
             if (response.data.list[i].srcpath !== null && response.data.list[i].picpath !== null && response.data.list[i].srcpath !== undefined && response.data.list[i].picpath !== undefined) {
               console.log(process.env.VUE_APP_BASE_API + response.data.list[i].srcpath, '=======1')
@@ -1506,8 +1578,6 @@ export default {
               this.listAdd[i].srcpath = ''
               this.listAdd[i].picpath = ''
             }
-            console.log(process.env.VUE_APP_BASE_API)
-            console.log(this.listSee, '============')
           }
         }
         if (response.data.total) {
@@ -1869,17 +1939,21 @@ export default {
         this.examineTemp = this.seeTemp
         this.$set(this.seeTemp, 'statue', 1)
         this.$set(this.seeTemp, 'workflowNote', '')
+        this.getdataListSee.parammaps.id = this.seeTemp.id
       } else {
         this.examineTemp = Object.assign({}, row)
+        this.getdataListSee.parammaps.id = this.examineTemp.id
         this.$set(this.examineTemp, 'statue', 1)
         this.$set(this.examineTemp, 'workflowNote', '')
       }
+      this.getSeeList()
       this.dialogStatus = 'examine3'
       this.dialogFormVisible_Examine = true
       this.statueReason = false
     },
     createExamineData3() {
       console.log('点击了供应主管审核')
+      console.log(this.isApplyEx4,'=====')
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
@@ -1891,12 +1965,30 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps.id = this.examineTemp.id
           if (this.examineTemp.statue == 1) {
-            this.requestParam.parammaps.statue = 5
+            if(this.examineTemp.purchase_type !== 1 && this.examineTemp.purchase_type !== 3){
+              console.log(this.isApplyEx4,'=====')
+              if(this.isApplyEx4 == true){
+                this.requestParam.parammaps.statue = 5
+              }else{
+                this.requestParam.parammaps.statue = 11
+              }
+            }else{
+              this.requestParam.parammaps.statue = 5
+            }
           } else if (this.examineTemp.statue == 2) {
-            this.requestParam.parammaps.statue = 6
+            if(this.examineTemp.purchase_type !== 1 && this.examineTemp.purchase_type !== 3){
+              if(this.isApplyEx4 == true){
+                this.requestParam.parammaps.statue = 6
+              }else{
+                this.requestParam.parammaps.statue = 12
+              }
+            }else{
+              this.requestParam.parammaps.statue = 6
+            }
           }
           this.requestParam.parammaps.empId	 = Cookies.get('employeid')
           this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote
+          // return false
           PostDataByName(this.requestParam).then(response => {
             console.log('审核确认发送参数', this.requestParam)
             this.isokDisable = false