Browse Source

修改了备件申购审核,特殊申购不受金额限制

duanxiaoduan 1 year ago
parent
commit
42104e38c1
2 changed files with 13 additions and 6 deletions
  1. 0 0
      dist/index.html
  2. 13 6
      src/views/custom/subscribe/index.vue

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


+ 13 - 6
src/views/custom/subscribe/index.vue

@@ -387,8 +387,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'">
@@ -1400,6 +1400,7 @@ export default {
       console.log('查看上方数据(从table读取)', this.seeTemp)
       this.listSee = []
       this.getdataListSee.parammaps.id = this.seeTemp.id
+      this.isApplyEx4 = false
       this.getSeeList()
     },
     getFlowPath(){
@@ -1938,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
@@ -1960,28 +1965,30 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps.id = this.examineTemp.id
           if (this.examineTemp.statue == 1) {
-            if(this.examineTemp.purchase_type !== 1 || this.examineTemp.purchase_type !== 3){
+            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 = 11
+              this.requestParam.parammaps.statue = 5
             }
           } else if (this.examineTemp.statue == 2) {
-            if(this.examineTemp.purchase_type !== 1 || this.examineTemp.purchase_type !== 3){
+            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 = 12
+              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

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