فهرست منبع

备件申购审核接口对接

duanxiaoduan 1 سال پیش
والد
کامیت
76daff5a2f
2فایلهای تغییر یافته به همراه262 افزوده شده و 151 حذف شده
  1. 1 1
      .env.development
  2. 261 150
      src/views/custom/subscribe/index.vue

+ 1 - 1
.env.development

@@ -7,7 +7,7 @@ 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.56:8082/'
 # 线上测试
 # VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'

+ 261 - 150
src/views/custom/subscribe/index.vue

@@ -93,12 +93,12 @@
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
           <el-button v-if="isSubscribeSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
-          <el-button  v-if="isSubscribeExamineKG && row.statue == 2" style="display:inline-block" type="success" size="mini" @click="form_edit1(row)">合单</el-button>
           <el-button v-if="row.statue == 4||row.statue == 6||row.statue == 8||row.statue == 10||row.statue == 12 ||row.statue == 14" style="display:inline-block" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button v-else style="display:none" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <!-- 库管 -->
-          <!-- <el-button v-if="isSubscribeExamineKG && row.statue == 2" style="display:inline-block" type="success" size="mini" @click="handleExamine1(row)">库管</el-button> -->
-          <el-button v-if="isSubscribeExamineKG && row.statue == 2" style="display:inline-block" type="success" size="mini" @click="form_modify1(row)">提交</el-button>
+          <el-button v-if="isSubscribeExamineKG && row.statue == 2 && row.departmentName == '挤奶处'" style="display:inline-block" type="success" size="mini" @click="handleExamine1(row)">库管</el-button>
+          <el-button  v-if="isSubscribeExamineKG && row.statue == 2 && row.departmentName !== '挤奶处'" style="display:inline-block" type="success" size="mini" @click="form_edit1(row)">合单</el-button>
+          <el-button v-if="isSubscribeExamineKG && row.statue == 2 && row.departmentName !== '挤奶处'" style="display:inline-block" type="success" size="mini" @click="form_modify1(row)">提交</el-button>
 
           <!-- 设备 -->
           <el-button v-if="isSubscribeExamineSBZG && row.statue == 3" style="display:inline-block" type="success" size="mini" @click="handleExamine2(row)">设备</el-button>
@@ -110,15 +110,16 @@
 
 
           <!-- 场长 -->
-          <el-button v-if="sdchangzhangshenhe  && row.statue == 5" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">场长</el-button>
+          <el-button v-if="sdchangzhangshenhe  && row.statue == 5 && (row.departmentName == '挤奶处' && row.examine == 1)" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">场长</el-button>
+          <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.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>
           <!-- 奶厅 -->
-          <el-button v-if="isSubscribeExamineNT && row.departmentName == '挤奶处' && row.statue == 11 " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
+          <el-button v-if="isSubscribeExamineNT && row.departmentName == '挤奶处' && (row.examine !== 1 && row.statue == 5 || row.statue == 11) " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
 
           <el-button v-if="isSubscribeDelete && (row.statue == 4||row.statue == 6||row.statue == 8||row.statue == 12)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
 
@@ -264,26 +265,24 @@
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-if="createTemp.providerId == ''" label="价格" prop="price" align="center" min-width="150">
+          <el-table-column  label="价格" prop="price" align="center" min-width="150">
             <template slot-scope="scope">
-              <div  v-for="item in scope.row.pricearr">
+              <div v-if="scope.row.contractId== '' || parseInt(scope.row.contractId) < 0 || parseInt(scope.row.contractId) == 0">
+                <el-form :model="scope.row" :rules="rules">
+                  <el-form-item>
+                    <el-input v-model="scope.row.price" style="margin-top:15px" />
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div v-else 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 v-if="createTemp.providerId == ''" label="使用周期" min-width="120px" align="center">
+          <el-table-column label="使用周期" min-width="120px" align="center">
             <template slot-scope="scope">
               <div v-for="item in scope.row.lifeCyclearr">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -293,7 +292,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column v-if="createTemp.providerId == ''" label="合同差异项" min-width="120px" align="center">
+          <el-table-column label="合同差异项" min-width="120px" align="center">
             <template slot-scope="scope">
               <div v-for="item in scope.row.contractVarianceItemarr">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -492,25 +491,6 @@
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column  v-if="createTemp.purchaseType == '1'" label="价格" prop="price" align="center" min-width="150">
-            <template slot-scope="scope">
-              <div v-if="createTemp.purchaseType == '1'" v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
-                <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-if="createTemp.purchaseType == '3'" 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 v-if="createTemp.purchaseType == '1'" label="使用周期" min-width="120px" align="center">
             <template slot-scope="scope">
               <div v-for="item in scope.row.lifeCyclearr">
@@ -531,6 +511,16 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column  v-if="createTemp.purchaseType == '1'" label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div v-if="createTemp.purchaseType == '1'" v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                <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-if="createTemp.purchaseType == '3'" label="价格" prop="price" align="center" min-width="150">
             <template slot-scope="scope">
               <el-form :model="scope.row" :rules="rules">
@@ -760,24 +750,25 @@
           <el-row>
             <el-col>
               <el-form-item label="操作:">
-                <!-- 库管 -->
-                <!-- <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2" type="success" style="display:inline-block" @click="handleExamine1(row)">库管</el-button> -->
+                <!-- 库管 -->
+                <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2 && seeTemp.departmentName == '挤奶处'" type="success" style="display:inline-block" @click="handleExamine1(row)">库管</el-button>
                <!-- 设备 -->
                <el-button v-if="isSubscribeExamineSBZG && seeTemp.statue == 3" type="success" style="display:inline-block" @click="handleExamine2(row)">设备</el-button>
                 <!-- 供应商主管 -->
                 <el-button v-if="isSubscribeExamineZG && seeTemp.statue == 9" type="success" style="display:inline-block" @click="handleExamine3(row)">供应商</el-button>
 
                 <!-- 场长 -->
-                <el-button v-if=" sdchangzhangshenhe  &&  seeTemp.statue == 5" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
+                <el-button v-if=" sdchangzhangshenhe  &&  seeTemp.statue == 5 && seeTemp.departmentName == '挤奶处' && seeTemp.examine == 1" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
+                <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 " type="success" style="display:inline-block" @click="handleExamine5(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="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">财务</el-button>
                 <!-- 奶厅 -->
-                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && seeTemp.statue == 11 " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
+                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && (seeTemp.examine !== 1 && seeTemp.statue == 5 || seeTemp.statue == 11)  " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
 
 
               </el-form-item>
@@ -1067,22 +1058,22 @@
             <el-col>
               <el-form-item label="操作:">
                 <!-- 库管 -->
-                <!-- <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2" type="success" style="display:inline-block" @click="handleExamine1(row)">库管</el-button> -->
+                <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2 && seeTemp.departmentName == '挤奶处'" type="success" style="display:inline-block" @click="handleExamine1(row)">库管</el-button>
                <!-- 设备 -->
                <el-button v-if="isSubscribeExamineSBZG && seeTemp.statue == 3" type="success" style="display:inline-block" @click="handleExamine2(row)">设备</el-button>
                 <!-- 供应商主管 -->
                 <el-button v-if="isSubscribeExamineZG && seeTemp.statue == 9" type="success" style="display:inline-block" @click="handleExamine3(row)">供应</el-button>
 
                 <!-- 场长 -->
-                <el-button v-if=" sdchangzhangshenhe  && seeTemp.statue == 5" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
-
+                <el-button v-if=" sdchangzhangshenhe  && seeTemp.statue == 5 && seeTemp.departmentName == '挤奶处' && seeTemp.examine == 1" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
+                <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 " type="success" style="display:inline-block" @click="handleExamine5(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="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(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>
                 <!-- 奶厅 -->
-                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && seeTemp.statue == 11 " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
+                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && (seeTemp.examine !== 1 && seeTemp.statue == 5 || seeTemp.statue == 11) " style="display:inline-block" type="success" @click="handleExamine7(row)">奶厅</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1382,7 +1373,7 @@ export default {
       const SubscribeExamineCW = 'customs:subscribe:examineCW'
       const isSubscribeExamineCW = checkButtons(this.$store.state.user.buttons, SubscribeExamineCW)
       this.isSubscribeExamineCW = isSubscribeExamineCW
-      
+
       // 财务审核
       const SubscribeExamineNT = 'customs:subscribe:examineNT'
       const isSubscribeExamineNT = checkButtons(this.$store.state.user.buttons, SubscribeExamineNT)
@@ -1491,33 +1482,30 @@ export default {
       }
     },
     statue: function(cellValue) {
-      // console.log(cellValue.isZeroStock)
-      if (cellValue.statue == 2) {
-        return '审核中'
-      } else if (cellValue.statue == 3) {
-        return '审核中'
-      } else if (cellValue.statue == 4) {
-        return '未通过'
-      } else if (cellValue.statue == 5) {
-        return '审核中'
-      } else if (cellValue.statue == 6) {
-        return '未通过'
-      } else if (cellValue.statue == 7) {
-        return '已通过'
-      } else if (cellValue.statue == 8) {
-        return '未通过'
-      } else if (cellValue.statue == 9) {
-        return '审核中'
-      } else if (cellValue.statue == 10) {
-        return '未通过'
-      } else if (cellValue.statue == 11) {
-        return '审核中'
-      } else if (cellValue.statue == 12) {
-        return '未通过'
-      } else if (cellValue.statue == 13) {
-        return '审核中'
-      } else if (cellValue.statue == 14) {
-        return '未通过'
+      console.log(cellValue)
+      // departmentName
+      // purchase_type
+      if(cellValue.purchase_type == 1){
+        // 特殊申购-暂估
+        if(cellValue.statue == 2 || cellValue.statue == 3 || cellValue.statue == 5 || cellValue.statue == 7 || cellValue.statue == 9 || cellValue.statue == 11 ){
+          return '审核中'
+        }else if(cellValue.statue == 13){
+          return '已通过'
+        }else{
+          return '未通过'
+        }
+      }else if(cellValue.purchase_type == 3){
+        // 特殊申购-赠品
+        return '已通过'
+      }else{
+        // 采购
+        if(cellValue.statue == 2 || cellValue.statue == 3 || cellValue.statue == 5 || cellValue.statue == 9 || cellValue.statue == 11 || cellValue.statue == 13 ){
+          return '审核中'
+        }else if(cellValue.statue == 7){
+          return '已通过'
+        }else{
+          return '未通过'
+        }
       }
     },
     form_search() {
@@ -1593,11 +1581,15 @@ export default {
       })
     },
     // getPartsListSG
-    changeProvider(item) {
+    changeProvider(item) {
+      console.log(item,'item')
       if (item !== '') {
         this.createTemp.providerName = this.onlineSubscriptionList.find(obj => obj.id == item).providerName
+      }else{
+        this.$set(this.createTemp,'providerName','')
+        this.$set(this.createTemp,'providerId','')
       }
-      this.listAdd = []
+      // this.listAdd = []
     },
     sparePartSearch(queryString, cb) {
       console.log('备件模糊查询输入值', queryString)
@@ -1620,7 +1612,9 @@ export default {
         }
       }else{
         if (this.createTemp.providerId == '') {
-          this.requestSparePart.name = 'getPartsListSG'
+          this.requestSparePart.name = 'getPartsListSG'
+          this.requestSparePart.parammaps['providerName'] = ''
+          this.requestSparePart.parammaps['providerId'] = ''
         } else {
           this.requestSparePart.name = 'getPartsListSGFlex'
           this.requestSparePart.parammaps.providerId = this.createTemp.providerId
@@ -1686,7 +1680,8 @@ export default {
             partslistSGv2(this.getParmCreateAmount).then(response => {
               this.$nextTick(() => {
                 console.log('新增根据编号获取备件库存数量', response.data.list[0])
-                item = response.data.list[0]
+                item = response.data.list[0]
+                this.$set(item,'myId',Date.parse(new Date()))
                 if (item.srcpath !== null && item.picpath !== null && item.srcpath !== undefined && item.picpath !== undefined) {
                   this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
                   this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)
@@ -1705,6 +1700,14 @@ export default {
                 if(item.price){
                   var pricearr = item.price.split(",")
                   this.$set(item,'pricearr',pricearr)
+                }else{
+                  this.$set(item,'pricearr',[])
+                }
+                if(item.contractId){
+                  var contractId = item.contractId
+                  this.$set(item,'contractId',contractId)
+                }else{
+                  this.$set(item,'contractId',0)
                 }
                 if(item.lifeCycle){
                   var lifeCyclearr = item.lifeCycle.split(",")
@@ -1724,7 +1727,8 @@ export default {
           partslistSGv2(this.getParmCreateAmount).then(response => {
             this.$nextTick(() => {
               console.log('新增根据编号获取备件库存数量', response.data.list[0])
-              item = response.data.list[0]
+              item = response.data.list[0]
+              this.$set(item,'myId',Date.parse(new Date()))
               if (item.srcpath !== null && item.picpath !== null && item.srcpath !== undefined && item.picpath !== undefined) {
                 this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
                 this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)
@@ -1743,6 +1747,8 @@ export default {
               if(item.price){
                 var pricearr = item.price.split(",")
                 this.$set(item,'pricearr',pricearr)
+              }else{
+                this.$set(item,'pricearr',[])
               }
               if(item.lifeCycle){
                 var lifeCyclearr = item.lifeCycle.split(",")
@@ -1751,6 +1757,12 @@ export default {
               if(item.contractVarianceItem){
                 var contractVarianceItemarr = item.contractVarianceItem.split(",")
                 this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
+              }
+              if(item.contractId){
+                var contractId = item.contractId
+                this.$set(item,'contractId',contractId)
+              }else{
+                this.$set(item,'contractId',0)
               }
               this.listAdd.unshift(item)
               this.$forceUpdate()
@@ -1779,6 +1791,8 @@ export default {
             if(item.price){
               var pricearr = item.price.split(",")
               this.$set(item,'pricearr',pricearr)
+            }else{
+              this.$set(item,'pricearr',[])
             }
             if(item.lifeCycle){
               var lifeCyclearr = item.lifeCycle.split(",")
@@ -1787,6 +1801,12 @@ export default {
             if(item.contractVarianceItem){
               var contractVarianceItemarr = item.contractVarianceItem.split(",")
               this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
+            }
+            if(item.contractId){
+              var contractId = item.contractId
+              this.$set(item,'contractId',contractId)
+            }else{
+              this.$set(item,'contractId',0)
             }
             this.listAdd.unshift(item)
           }
@@ -1804,6 +1824,12 @@ export default {
             this.$set(item,'price','0')
             this.$set(item,'amount','0')
           }
+          if(item.contractId){
+            var contractId = item.contractId
+            this.$set(item,'contractId',contractId)
+          }else{
+            this.$set(item,'contractId',0)
+          }
           if(this.dialogStatus !=='special' && this.createTemp.providerId == ''){
             var pricearr = item.price.split(",")
             this.$set(item,'pricearr',pricearr)
@@ -1816,6 +1842,8 @@ export default {
             if(item.price){
               var pricearr = item.price.split(",")
               this.$set(item,'pricearr',pricearr)
+            }else{
+              this.$set(item,'pricearr',[])
             }
             if(item.lifeCycle){
               var lifeCyclearr = item.lifeCycle.split(",")
@@ -1870,24 +1898,6 @@ export default {
               return false
             }
           }
-          if (this.createTemp.providerId !== '') {
-            if (this.listAdd[j].price == '') {
-              this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
-              return false
-            } else {
-              if (parseFloat(this.listAdd[j].price) == 0) {
-                this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
-                return false
-              } else {
-                // var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
-                var rulesPrice = /(^[1-9](\d+)?(\.\d{1,5})?$)|(^\d\.\d{1,5}$)/
-                if (rulesPrice.test(this.listAdd[j].price) == false) {
-                  this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
-                  return false
-                }
-              }
-            }
-          }
         }
         if(this.createTemp.markBackend){
           console.log('有数据-走新保存')
@@ -1910,13 +1920,17 @@ export default {
               "brandId": parseFloat(this.listAdd[i].brandId),
               "purpose":  this.listAdd[i].purpose.toString(),
               "price":  this.listAdd[i].price.toString(),
-              "contractId":  this.listAdd[i].contractId.toString(),
               "lifeCycle":  this.listAdd[i].lifeCycle.toString(),
               "contractVarianceItem":  this.listAdd[i].contractVarianceItem.toString(),
               "departmentId": this.createTemp.departmentId.toString(),
               "date": this.createTemp.createTime.toString(),
               "employeId": parseFloat(this.createTemp.employeId)
             }
+            if(this.listAdd[i].contractId){
+              this.$set(this.listAdd[i],'contractId',this.listAdd[i].contractId.toString())
+            }else{
+              this.$set(this.listAdd[i],'contractId','')
+            }
             if(this.listAdd[i].storageAmount){
               obj.storageAmount = parseFloat(this.listAdd[i].storageAmount)
             }else{
@@ -1947,9 +1961,45 @@ export default {
           })
         }else{
           console.log('无数据-走原有保存')
+          for (var j = 0; j < this.listAdd.length; j++) {
+            console.log(this.listAdd[j].amount)
+            if (this.listAdd[j].amount == null || this.listAdd[j].amount === '') {
+              this.$message({ type: 'warning', message: '请检查申购数量是否未填写', duration: 2000 })
+              return false
+            } else {
+              var rulesAmount = /^[1-9]\d*$/
+              if (!rulesAmount.test(this.listAdd[j].amount)) {
+                this.$message({ type: 'error', message: '申购数量请输入正整数', duration: 2000 })
+                return false
+              }
+            }
+            if (this.createTemp.providerId !== '') {
+              if (this.listAdd[j].price == '') {
+                this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
+                return false
+              } else {
+                if (parseFloat(this.listAdd[j].price) == 0) {
+                  this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                  return false
+                } else {
+                  // var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
+                  var rulesPrice = /(^[1-9](\d+)?(\.\d{1,5})?$)|(^\d\.\d{1,5}$)/
+                  if (rulesPrice.test(this.listAdd[j].price) == false) {
+                    this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                    return false
+                  }
+                }
+              }
+            }
+          }
           for(let i=0;i<this.listAdd.length;i++){
             this.$set(this.listAdd[i],'date',this.createTemp.createTime)
             this.$set(this.listAdd[i],'employeId',this.createTemp.employeId)
+            if(this.listAdd[i].reject){
+              this.$set(this.listAdd[i],'reject',this.listAdd[i].reject)
+            }else{
+              this.$set(this.listAdd[i],'reject',0)
+            }
           }
           this.postDataPramas.common = { 'returnmap': '0' }
           this.postDataPramas.data = []
@@ -1982,6 +2032,8 @@ export default {
             lifeCycle: '@insertSpotList.lifeCycle',
             date: '@insertSpotList.date',
             employeId: '@insertSpotList.employeId',
+            reject: '@insertSpotList.reject',
+            departmentId: this.createTemp.departmentId,
             contractVarianceItem: '@insertSpotList.contractVarianceItem'
           }}
           ExecDataByConfig(this.postDataPramas).then(response => {
@@ -2109,45 +2161,83 @@ export default {
       } else if(this.seeTemp.purchase_type < 0 || this.seeTemp.purchase_type == 0){
         if(this.seeTemp.departmentName == '挤奶处'){
           // 奶厅申购审核流程
-          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
-          }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: '场长审核' },{ 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: '场长审核' },{ 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: '场长审核' },{ 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: '场长审核' },{ 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: '场长审核' },{ title: '职能中心审核' }, { 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: '场长审核' },{ 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: '职能中心审核' }, { 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: '职能中心审核' },{ title: '采购审核' }]
-            this.active = 5
-          } else if (this.seeTemp.statue === 15) {
-            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.positionName, name: this.seeTemp.positiondate }, { title: '采购审核' }]
-            this.active = 6
-          } else if (this.seeTemp.statue === 16) {
-            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.positionName, name: this.seeTemp.positiondate, status: 'error', reason: reason  }, { title: '采购审核' }]
-            this.active = 6
-          } 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.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson }]
-            this.active = 7
-          } 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.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
-            this.active = 7
+          if(this.seeTemp.examine == 1){
+            console.log(11111111111)
+            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
+            }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: '场长审核' },{ 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: '场长审核' },{ 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: '场长审核' },{ 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: '场长审核' },{ 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: '场长审核' },{ title: '职能中心审核' }, { 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: '场长审核' },{ 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: '职能中心审核' }, { 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: '职能中心审核' },{ title: '采购审核' }]
+              this.active = 5
+            } else if (this.seeTemp.statue === 15) {
+              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.positionName, name: this.seeTemp.positiondate }, { title: '采购审核' }]
+              this.active = 6
+            } else if (this.seeTemp.statue === 16) {
+              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.positionName, name: this.seeTemp.positiondate, status: 'error', reason: reason  }, { title: '采购审核' }]
+              this.active = 6
+            } 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.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson }]
+              this.active = 7
+            } 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.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
+              this.active = 7
+            }
+          }else{
+            if (this.seeTemp.statue === 2) {
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核' },{ 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: '职能中心审核' }, { 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: '职能中心审核' }, { 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: '职能中心审核' }, { 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: '职能中心审核' }, { 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: '职能中心审核' }, { 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: '职能中心审核' },{ title: '采购审核' }]
+              this.active = 4
+            } else if (this.seeTemp.statue === 15) {
+              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.positionName, name: this.seeTemp.positiondate }, { title: '采购审核' }]
+              this.active = 5
+            } else if (this.seeTemp.statue === 16) {
+              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.positionName, name: this.seeTemp.positiondate, status: 'error', reason: reason  }, { title: '采购审核' }]
+              this.active = 5
+            } 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.positionName, name: this.seeTemp.positiondate }, { 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.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
+              this.active = 6
+            }
           }
         }else{
           // 申购合单审核流程
@@ -2233,11 +2323,14 @@ export default {
             priceObj = false
           }
           console.log("priceObj",priceObj)
-          //总价大于2000 或单价>500
+          //总价大于2000 或单价>500
+
           if(sumPrices >= 2000 || priceObj){
-            // 这个版本不要了
-            // this.isApplyEx4 = true
-            this.isApplyEx4 = false
+            if(this.isMilk){
+              this.isApplyEx4 = true
+            }else{
+              this.isApplyEx4 = false
+            }
             this.getFlowPath()
           } else {
             this.isApplyEx4 = false
@@ -2332,6 +2425,15 @@ export default {
               }
             }
           }
+        }
+        for(let i=0;i<this.listAdd.length;i++){
+          this.$set(this.listAdd[i],'date',this.createTemp.createTime)
+          this.$set(this.listAdd[i],'employeId',this.createTemp.employeId)
+          if(this.listAdd[i].reject){
+            this.$set(this.listAdd[i],'reject',this.listAdd[i].reject)
+          }else{
+            this.$set(this.listAdd[i],'reject',0)
+          }
         }
         this.postDataPramas.common = { 'returnmap': '0' }
         this.postDataPramas.data = []
@@ -2358,8 +2460,11 @@ export default {
           amount: '@insertSpotList.amount',
           price: '@insertSpotList.price',
           contractId: '@insertSpotList.contractId',
-          lifeCycle: '@insertSpotList.lifeCycle',
-          contractVarianceItem: '@insertSpotList.contractVarianceItem',
+          lifeCycle: '@insertSpotList.lifeCycle',
+          reject: '@insertSpotList.reject',
+          departmentId: this.createTemp.departmentId,
+          contractVarianceItem: '@insertSpotList.contractVarianceItem',
+          // partpurchase:''
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
           console.log('新增保存发送参数', this.postDataPramas)
@@ -3079,13 +3184,17 @@ export default {
                 "brandId": parseFloat(this.listAdd[i].brandId),
                 "purpose":  this.listAdd[i].purpose.toString(),
                 "price":  this.listAdd[i].price.toString(),
-                "contractId":  this.listAdd[i].contractId.toString(),
                 "lifeCycle":  this.listAdd[i].lifeCycle.toString(),
                 "contractVarianceItem":  this.listAdd[i].contractVarianceItem.toString(),
                 "departmentId": this.createTemp.departmentId.toString(),
                 "date": this.createTemp.createTime.toString(),
                 "employeId": parseFloat(this.createTemp.employeId)
               }
+              if(this.listAdd[i].contractId){
+                this.$set(this.listAdd[i],'contractId',this.listAdd[i].contractId.toString())
+              }else{
+                this.$set(this.listAdd[i],'contractId','')
+              }
               if(this.listAdd[i].storageAmount){
                 obj.storageAmount = parseFloat(this.listAdd[i].storageAmount)
               }else{
@@ -3220,8 +3329,8 @@ export default {
         this.$message({
           type: 'info',
           message: '取消输入'
-        });
-      });
+        })
+      })
     },
     form_modify(){
       // 提交
@@ -3282,7 +3391,7 @@ export default {
           type: 'info',
           message: '已取消'
         });
-      });
+      })
     },
     handle_milkSubscription(){
       // 奶厅申购
@@ -3297,6 +3406,8 @@ export default {
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible_seepart = false
+      this.getCreateNumber()
+      this.createTemp.markBackend = false
       this.$nextTick(() => {
         this.$refs['createTemp'].clearValidate()
       })