1.备件出库去掉编码类型；2.新增申购状态筛选条件；3.委外维修新增保存更改发送参数

src/views/custom/outStock/index.vue

@@ -392,7 +392,7 @@
             </el-col>
             <el-col v-if="No2 && createTemp.useType == 6" :span="8">
               <el-form-item label="青贮单号：" prop="greenFodderNumber">
-                <el-input ref="greenFodderNumber" v-model="createTemp.greenFodderNumber" type="number" maxlength="20" />
+                <el-input ref="greenFodderNumber" v-model="createTemp.greenFodderNumber" maxlength="20" />
               </el-form-item>
             </el-col>
             <el-col v-if="isReceiveTime2" :span="8">

src/views/custom/subscribe/index.vue

@@ -15,6 +15,9 @@
       <el-select v-model="getdataListParm.parammaps.departmentId" clearable style="width: 140px;" placeholder="申购部门" class="filter-item">
         <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
+      <el-select v-model="getdataListParm.parammaps.purchase_type" clearable style="width: 140px;" placeholder="申购状态" class="filter-item">
+        <el-option v-for="item in subscriptionStatusList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
       <el-input v-model="getdataListParm.parammaps.empName" placeholder="申购人" style="width: 200px;" class="filter-item" />
       <!-- <el-select v-model="getdataListParm.parammaps.empName " style="width: 140px;" placeholder="申购人" class="filter-item">
         <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
@@ -78,11 +81,18 @@
         </template>
       </el-table-column>
       <el-table-column label="申购日期" sortable prop="inputTime" min-width="80px" align="center" />
+      <el-table-column label="申购状态" min-width="80px" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.purchase_type == 1">暂估</span>
+          <span v-else-if="scope.row.purchase_type == 2">垫付</span>
+          <span v-else>正常</span>
+        </template>
+      </el-table-column>
       <el-table-column label="审核状态" min-width="80px" align="center" :formatter="statue" />
       <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="row.statue == 4||row.statue == 6||row.statue == 8||row.statue == 10||row.statue == 12" style="display:inline-block" type="success" size="mini" @click="form_edit(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)">审核1</el-button>
@@ -90,14 +100,16 @@
           <!-- 设备 -->
           <el-button v-if="isSubscribeExamineSBZG && row.statue == 3" style="display:inline-block" type="success" size="mini" @click="handleExamine2(row)">审核2</el-button>
 
-          <!-- 主管 -->
+          <!-- 供应商主管 -->
           <el-button v-if="isSubscribeExamineZG && row.statue == 9" style="display:inline-block" type="success" size="mini" @click="handleExamine3(row)">审核3</el-button>
 
 
 
 
           <!-- 场长 -->
-          <el-button v-if="sdchangzhangshenhe  &&  row.statue == 5" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">审核4</el-button>
+          <el-button v-if="sdchangzhangshenhe  && (row.purchase_type < 0 || row.purchase_type == 0) &&  row.statue == 5" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">审核4</el-button>
+
+          <el-button v-if="sdchangzhangshenhe  && row.purchase_type > 0 &&  row.statue == 13" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">审核4</el-button>
 
 
 
@@ -106,7 +118,7 @@
           <el-button v-if="isSubscribeExamineCG && row.statue == 11 " style="display:inline-block" type="success" size="mini" @click="handleExamine5(row)">审核5</el-button>
 
           <!-- 财务 -->
-          <el-button v-if="isSubscribeExamineCW && row.statue == 13 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核6</el-button>
+          <el-button v-if="isSubscribeExamineCW && row.purchase_type > 0 && row.statue == 5 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核6</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>
 
@@ -177,14 +189,14 @@
             <el-col v-if="dialogStatus==='special' && createTemp.purchaseType == '1'" :span="8">
               <el-form-item label="供应商：" prop="providerId">
                 <el-select v-model="createTemp.providerId" placeholder="供应商" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'">
-                  <el-option v-for="item in providerList" :key="item.id" :label="item.providerIntro" :value="item.id" />
+                  <el-option v-for="item in providerList" :key="item.id" :label="item.providerName" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-if="dialogStatus==='special' && createTemp.purchaseType == '2'" :span="8">
               <el-form-item label="供应商：" prop="providerId">
                 <el-select v-model="createTemp.providerId" placeholder="供应商" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'">
-                  <el-option v-for="item in providerList" :key="item.id" :label="item.providerIntro" :value="item.id" />
+                  <el-option v-for="item in providerList" :key="item.id" :label="item.providerName" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -199,8 +211,8 @@
           <el-row v-if="dialogStatus==='special'">
             <el-col :span="24">
               <el-form-item label="申购类型：" prop="purchaseType">
-                <el-radio v-model="createTemp.purchaseType" label="1">暂估</el-radio>
-                <el-radio v-model="createTemp.purchaseType" label="2">垫付</el-radio>
+                <el-radio v-model="createTemp.purchaseType" label="1" @change="changeType()">暂估</el-radio>
+                <el-radio v-model="createTemp.purchaseType" label="2" @change="changeType()">垫付</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -277,10 +289,20 @@
           </el-table-column>
           <el-table-column label="现有库存" prop="reportery" align="center" min-width="60">
             <template slot-scope="scope">
-              <span>{{ scope.row.reportery }}</span>
+              <span v-if="createTemp.providerId == ''">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="价格" prop="price" align="center" min-width="60">
+          <el-table-column v-if="dialogStatus==='special'" label="价格" prop="price" align="center" min-width="60">
+            <template slot-scope="scope">
+              <span v-if="createTemp.purchaseType == '1'">{{ scope.row.price }}</span>
+              <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>
+          <el-table-column v-else label="价格" prop="price" align="center" min-width="60">
             <template slot-scope="scope">
               <span v-if="createTemp.providerId == ''">{{ scope.row.price }}</span>
               <el-form v-else :model="scope.row" :rules="rules">
@@ -482,18 +504,19 @@
                 <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2" type="success" style="display:inline-block" @click="handleExamine1(row)">审核1</el-button>
                <!-- 设备 -->
                <el-button v-if="isSubscribeExamineSBZG && seeTemp.statue == 3" type="success" style="display:inline-block" @click="handleExamine2(row)">审核2</el-button>
-                <!-- 主管 -->
+                <!-- 供应商主管 -->
                 <el-button v-if="isSubscribeExamineZG && seeTemp.statue == 9" type="success" style="display:inline-block" @click="handleExamine3(row)">审核3</el-button>
 
                 <!-- 场长 -->
-                <el-button v-if=" sdchangzhangshenhe  &&  seeTemp.statue == 5" type="success" style="display:inline-block" @click="handleExamine4(row)">审核4</el-button>
+                <el-button v-if=" sdchangzhangshenhe  && (seeTemp.purchase_type < 0 || seeTemp.purchase_type == 0) && seeTemp.statue == 5" type="success" style="display:inline-block" @click="handleExamine4(row)">审核4</el-button>
+                <el-button v-if=" sdchangzhangshenhe  &&  seeTemp.statue == 13" type="success" style="display:inline-block" @click="handleExamine4(row)">审核4</el-button>
 
 
                 <!-- 采购 -->
                 <el-button v-if="isSubscribeExamineCG && seeTemp.statue == 11 " type="success" style="display:inline-block" @click="handleExamine5(row)">审核5</el-button>
 
 
-                <el-button v-if="isSubscribeExamineCW && seeTemp.statue == 11 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核6</el-button>
+                <el-button v-if="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 5 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核6</el-button>
 
 
               </el-form-item>
@@ -564,6 +587,7 @@ export default {
       findAllPasture: [],
       findAllDepart: [],
       findAllEmploye: [],
+      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:2,name:'垫付'}],//申购状态
       onlineSubscriptionList: [], createDepartList: [], edit: 0,
       requestParams: [
         { name: 'findAllProvider', offset: 0, pagecount: 0, params: [] },
@@ -616,7 +640,8 @@ export default {
           loginId: Cookies.get('employeid'),
           menu: 'Subscribe',
           logindeptId: Cookies.get('departmentid'),
-          loginpastureId: Cookies.get('pastureid')
+          loginpastureId: Cookies.get('pastureid'),
+          purchase_type:''
         }
       },
       tableKey: 0,
@@ -914,6 +939,10 @@ export default {
         return '审核中'
       } else if (cellValue.statue == 12) {
         return '未通过'
+      } else if (cellValue.statue == 13) {
+        return '审核中'
+      } else if (cellValue.statue == 14) {
+        return '未通过'
       }
     },
     form_search() {
@@ -967,12 +996,27 @@ export default {
     },
     sparePartSearch(queryString, cb) {
       console.log('备件模糊查询输入值', queryString)
-      if (this.createTemp.providerId == '') {
-        this.requestSparePart.name = 'getPartsListSG'
-      } else {
-        this.requestSparePart.name = 'getPartsListSGFlex'
-        this.requestSparePart.parammaps.providerId = this.createTemp.providerId
-        this.requestSparePart.parammaps.providerName = this.createTemp.providerName
+      if(this.dialogStatus==='special'){
+        if(this.createTemp.providerId !== ''){
+          this.requestSparePart.name = 'getPartsListSG'
+          this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
+        }else{
+          if(this.createTemp.purchaseType == 1){
+            this.$message({ type: 'warning', message: '请选择供应商' })
+            return false;
+          }else{
+            this.requestSparePart.name = 'getPartsListSG'
+            this.requestSparePart.parammaps['providerId'] = ''
+          }
+        }
+      }else{
+        if (this.createTemp.providerId == '') {
+          this.requestSparePart.name = 'getPartsListSG'
+        } else {
+          this.requestSparePart.name = 'getPartsListSGFlex'
+          this.requestSparePart.parammaps.providerId = this.createTemp.providerId
+          this.requestSparePart.parammaps.providerName = this.createTemp.providerName
+        }
       }
       this.requestSparePart.parammaps['partCode'] = queryString
       GetDataByName(this.requestSparePart).then(response => {
@@ -988,28 +1032,14 @@ export default {
       console.log('备件模糊查询选中值', item)
       console.log('备件模糊查询选中值', item.partId)
       console.log(this.listAdd)
+      if(this.dialogStatus==='special' && this.createTemp.purchaseType == '1' && this.createTemp.providerId == ''){
+        this.createTemp.providerId = item.providerId
+      }
       if (this.createTemp.providerId == '') {
         if (this.listAdd.length > 0) {
-          // eslint-disable-next-line no-redeclare
           if (this.listAdd.find(obj => obj.partId == item.partId)) {
             this.$message({ type: 'warning', message: '此备件已存在，请重新选择备件' })
           } else {
-            // this.getParmCreateAmount.parammaps.partCode = item.partCode
-            // GetDataByName(this.getParmCreateAmount).then(response => {
-            //   this.$nextTick(() => {
-            //     console.log('新增根据编号获取备件库存数量', response.data.list[0].reporteryNum)
-            //     item.reportery = response.data.list[0].reporteryNum
-            //     if (item.srcpath !== null && item.picpath) {
-            //       this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
-            //       this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)
-            //     } else {
-            //       item.srcpath = ''
-            //       item.picpath = ''
-            //     }
-            //     this.listAdd.unshift(item)
-            //     this.$forceUpdate()
-            //   })
-            // })
             this.getParmCreateAmount.parammaps.partCode = item.partCode
             partslistSGv2(this.getParmCreateAmount).then(response => {
               this.$nextTick(() => {
@@ -1030,22 +1060,6 @@ export default {
             })
           }
         } else {
-          // this.getParmCreateAmount.parammaps.partCode = item.partCode
-          // GetDataByName(this.getParmCreateAmount).then(response => {
-          //   this.$nextTick(() => {
-          //     console.log('新增根据编号获取备件库存数量', response.data.list[0].reporteryNum)
-          //     item.reportery = response.data.list[0].reporteryNum
-          //     if (item.srcpath !== null && item.picpath) {
-          //       this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
-          //       this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)
-          //     } else {
-          //       item.srcpath = ''
-          //       item.picpath = ''
-          //     }
-          //     this.listAdd.unshift(item)
-          //     this.$forceUpdate()
-          //   })
-          // })
           this.getParmCreateAmount.parammaps.partCode = item.partCode
           partslistSGv2(this.getParmCreateAmount).then(response => {
             this.$nextTick(() => {
@@ -1097,6 +1111,7 @@ export default {
         }
         this.$forceUpdate()
       }
+      console.log(this.listAdd,'this.listAdd')
     },
     add_dialog_save() {
       this.isokDisable = true
@@ -1141,12 +1156,12 @@ export default {
               return false
             } else {
               if (parseFloat(this.listAdd[j].price) == 0) {
-                this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后两位', duration: 2000 })
                 return false
               } else {
-                var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,5})?$/
+                var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
                 if (rulesPrice.test(this.listAdd[j].price) == false) {
-                  this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                  this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后两位', duration: 2000 })
                   return false
                 }
               }
@@ -1250,7 +1265,7 @@ export default {
 
 
 
-      if (this.seeTemp.purchase_type >0) {
+      if (this.seeTemp.purchase_type < 0 || this.seeTemp.purchase_type == 0 ) {
           if (this.seeTemp.statue === 2) {
             this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核' },{ title: '设备主管审核' }, { title: '供应主管审核' }, { title: '场长审核' },{ title: '采购审核' }]
             this.active = 1
@@ -1272,8 +1287,6 @@ export default {
           } 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 === 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
@@ -1290,6 +1303,46 @@ export default {
           }
       } 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
+        } 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 === 13) {
+          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.financedate, name: this.seeTemp.financeName },{ title: '场长审核',}, { title: '采购审核' }]
+          this.active = 5
+        } else if (this.seeTemp.statue === 14) {
+          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.financedate, name: this.seeTemp.financeName, status: 'error', reason: reason },{ title: '场长审核' }, { title: '采购审核' }]
+          this.active = 5
+        }  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.financedate, name: this.seeTemp.financeName },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson }, { title: '采购审核' }]
+          this.active = 6
+        } 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.financedate, name: this.seeTemp.financeName },{ title: '场长审核' , date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson, 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.financedate, name: this.seeTemp.financeName }, { title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson }, { 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.financedate, name: this.seeTemp.financeName },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
+          this.active = 7
+        }
       }
 
 
@@ -1377,12 +1430,12 @@ export default {
               return false
             } else {
               if (parseFloat(this.listAdd[j].price) == 0) {
-                this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后两位', duration: 2000 })
                 return false
               } else {
-                var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,5})?$/
+                var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
                 if (rulesPrice.test(this.listAdd[j].price) == false) {
-                  this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                  this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后两位', duration: 2000 })
                   return false
                 }
               }
@@ -1870,35 +1923,29 @@ export default {
       this.$refs['examineTemp'].validate(valid => {
         if (valid) {
           this.requestParam = {}
+          this.requestParam.name = 'partpurchaseFinanceId'
           this.requestParam.parammaps = {}
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
+          this.requestParam.parammaps.id = this.examineTemp.id
           if (this.examineTemp.statue == 1) {
-            this.requestParam.data[0] = { 'name': 'partpurchaseCharge1', 'type': 'e', 'parammaps': {
-              id: this.examineTemp.id,
-              statue: 7,
-              empId: Cookies.get('employeid'),
-              workflowNote: this.examineTemp.workflowNote
-            }}
-            this.requestParam.data[1] = { 'name': 'createBuydetailBySG', 'type': 'e', 'parammaps': {
-              id: this.examineTemp.id,
-              pastureId: this.examineTemp.pastureId
-            }}
+            this.requestParam.parammaps.statue = 13
           } else if (this.examineTemp.statue == 2) {
-            this.requestParam.data[0] = { 'name': 'partpurchaseCharge1', 'type': 'e', 'parammaps': {
-              id: this.examineTemp.id,
-              statue: 8,
-              empId: Cookies.get('employeid'),
-              workflowNote: this.examineTemp.workflowNote
-            }}
+            this.requestParam.parammaps.statue = 14
           }
-          ExecDataByConfig(this.requestParam).then(response => {
+          this.requestParam.parammaps.financeId	 = Cookies.get('employeid')
+          this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote
+          PostDataByName(this.requestParam).then(response => {
+            console.log('审核确认发送参数', this.requestParam)
             if (response.msg !== 'fail') {
               this.get_table_data()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
               this.statueReason = false
-              this.$notify({ title: '成功', message: '审核成功', type: 'success', duration: 2000 })
+              this.$notify({
+                title: '成功',
+                message: '审核成功',
+                type: 'success',
+                duration: 2000
+              })
             } else {
               failproccess(response, this.$notify)
             }
@@ -1933,6 +1980,10 @@ export default {
         }
       })
     },
+    changeType(){
+      this.listAdd = []
+      this.$set(this.createTemp,'providerId','')
+    },
     special_dialog_save(){
       console.log('特殊申购保存')
       this.isokDisable = true
@@ -1972,24 +2023,41 @@ 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 })
+          if(this.createTemp.purchaseType == '2'){
+            if (this.createTemp.providerId !== '') {
+              if (this.listAdd[j].price == '') {
+                this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
                 return false
               } else {
-                var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,5})?$/
-                if (rulesPrice.test(this.listAdd[j].price) == false) {
-                  this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                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})?$/
+                  if (rulesPrice.test(this.listAdd[j].price) == false) {
+                    this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后两位', duration: 2000 })
+                    return false
+                  }
                 }
               }
             }
           }
         }
+        if(this.createTemp.purchaseType == '1'){
+          if(this.createTemp.providerId == ''){
+            this.$message({ type: 'error', message: '请选择供应商', duration: 2000 })
+            return false
+          }
+        }else{
+          if(this.createTemp.providerId == ''){
+            this.$message({ type: 'error', message: '请选择供应商', duration: 2000 })
+            return false
+          }
+          if(this.createTemp.funderId == ''){
+            this.$message({ type: 'error', message: '请选择垫付人', duration: 2000 })
+            return false
+          }
+        }
         let url = 'authdata/spare/parts/requisitions'
         let data = {
           "pastureId": parseInt(this.createTemp.pastureId),

src/views/maintenance/subcontractingMainten/tabPage/tab1.vue

@@ -1324,8 +1324,8 @@ export default {
         //牧场
         var mydata = {
           // acceptanceCode:this.createTemp.acceptanceCode,
-          pastureId:  parseInt(Cookies.get('pastureid')),
-          departmentId: parseInt(Cookies.get('departmentid')),
+          pastureId:  this.createTemp.pastureId,
+          departmentId: this.createTemp.departmentId,
           applicant:Cookies.get('employeid'),
           outsourcingCode:this.createTemp.outsourcingCode,
           applyType:0,