1.更改了备件出库查看类型；2.备件采购新增审核确认不能二次点击；3.备件申购垫付人新增搜索；4.维修故障新增下钻发送参数

.env.development

@@ -6,10 +6,10 @@ 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/'
 
  # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'

src/views/custom/outStock/index.vue

@@ -759,28 +759,44 @@
                   <el-radio v-model="seeTemp.useType" :label="1">手动出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="4">调拨出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="5">报废出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="6">青贮出库</el-radio>
                 </el-radio-group>
                 <el-radio-group v-if="seeTemp.useType == 2" v-model="seeTemp.useType" disabled>
                   <el-radio v-model="seeTemp.useType" :label="2" checked>领用出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="1">手动出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="4">调拨出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="5">报废出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="6">青贮出库</el-radio>
                 </el-radio-group>
                 <el-radio-group v-if="seeTemp.useType == 3" v-model="seeTemp.useType" disabled>
                   <el-radio v-model="seeTemp.useType" :label="3" checked>领用出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="1">手动出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="4">调拨出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="5">报废出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="6">青贮出库</el-radio>
                 </el-radio-group>
                 <el-radio-group v-if="seeTemp.useType == 5" v-model="seeTemp.useType" disabled>
                   <el-radio v-model="seeTemp.useType" :label="3">领用出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="1">手动出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="4">调拨出库</el-radio>
                   <el-radio v-model="seeTemp.useType" :label="5" checked>报废出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="6">青贮出库</el-radio>
+                </el-radio-group>
+                <el-radio-group v-if="seeTemp.useType == 6" v-model="seeTemp.useType" disabled>
+                  <el-radio v-model="seeTemp.useType" :label="3">领用出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="1">手动出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="4">调拨出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="5">报废出库</el-radio>
+                  <el-radio v-model="seeTemp.useType" :label="6" checked>青贮出库</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="seeTemp.useType == 6">
+              <el-form-item v-if="oddCodeAllo" label="青贮单号：" prop="greenFodderNumber">
+                <el-input ref="oddCode" v-model="seeTemp.greenFodderNumber" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" v-else>
               <el-form-item v-if="oddCodeAllo" label="领用单号：" prop="oddCode">
                 <el-input ref="oddCode" v-model="seeTemp.oddCode" disabled />
               </el-form-item>
@@ -1223,7 +1239,8 @@ export default {
         receiveTime: parseTime(new Date(), '{y}-{m}-{d}'),
         applicatId: Cookies.get('employeid'),
         departmentId: Cookies.get('departmentid'),
-        greenFodderNumber:''
+        greenFodderNumber:'',
+        note:''
       },
       requestSparePart: {
         name: 'getPartsListCK',
@@ -1705,6 +1722,8 @@ export default {
         return '调拨出库'
       } else if (cellValue.useType === 5) {
         return '报废出库'
+      } else if (cellValue.useType === 6) {
+        return '青贮出库'
       }
     },
 
@@ -1798,6 +1817,7 @@ export default {
       this.listAdd = []
       this.createTemp.useForm = ''
       this.createTemp.greenFodderNumber = ''
+      this.createTemp.note = ''
       this.No1 = true
       this.No2 = false
       this.No3 = false

src/views/custom/purchase/index.vue

@@ -3290,6 +3290,10 @@ export default {
       console.log(this.examineTemp)
       this.$refs['examineTemp'].validate(valid => {
         if (valid) {
+          this.isokDisable = true
+          setTimeout(() => {
+            this.isokDisable = false
+          }, 5000)
           if (this.examineTemp.SHstatue == 1) {
             console.log('通过')
             this.postDataPramas.common = { 'returnmap': '0' }
@@ -3308,6 +3312,7 @@ export default {
               'matchCode': this.examineTemp.matchCode
             }}
             ExecDataByConfig(this.postDataPramas).then(response => {
+              this.isokDisable = false
               console.log('审核保存发送参数', this.postDataPramas)
               if (response.msg === 'fail') {
                 this.$notify({

src/views/custom/subscribe/index.vue

@@ -204,7 +204,7 @@
             </el-col>
             <el-col  :span="8" v-if="dialogStatus==='special' && createTemp.purchaseType == '2'">
               <el-form-item label="垫付人：" prop="funderId">
-                <el-select v-model="createTemp.funderId" placeholder="垫付人" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'">
+                <el-select v-model="createTemp.funderId" filterable placeholder="垫付人" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -390,14 +390,19 @@
                 <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>
             </el-col>
-            <el-col :span="8" v-if="seeTemp.purchase_type > 0">
+            <el-col :span="8" v-if="seeTemp.purchaseType == '2'">
+              <el-form-item label="供应商：" prop="funderProviderName ">
+                <el-input ref="funderProviderName " v-model="seeTemp.funderProviderName " disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" v-if="seeTemp.purchase_type > 0 && seeTemp.purchaseType !== '2'">
               <el-form-item label="供应商：" prop="providerName">
                 <el-input ref="providerName" v-model="seeTemp.providerName" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8" v-if="seeTemp.purchaseType == '2'">
-              <el-form-item label="垫付人：" prop="providerName">
-                <el-input ref="providerName" v-model="seeTemp.providerName" disabled />
+              <el-form-item label="垫付人：" prop="funder_name">
+                <el-input ref="funder_name" v-model="seeTemp.funder_name" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8" v-if="seeTemp.purchase_type < 1">
@@ -962,6 +967,7 @@ export default {
     resetCreateTemp() {
       this.createTemp.pastureId = parseInt(Cookies.get('pastureid'))
       this.createTemp.departmentId = parseInt(Cookies.get('departmentid'))
+      this.createTemp.departmentName = Cookies.get('departmentname')
       this.createTemp.employeId = parseInt(Cookies.get('employeid'))
       this.createTemp.createTime = parseTime(new Date(), '{y}-{m}-{d}')
       this.createTemp.orderNumber = ''
@@ -1005,7 +1011,7 @@ export default {
           this.requestSparePart.name = 'getPartsListSG'
           this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
         }else{
-          if(this.createTemp.purchaseType == 3 || this.createTemp.purchaseType == 1){
+          if(this.createTemp.purchaseType == 1){
             this.$message({ type: 'warning', message: '请选择供应商' })
             return false;
           }else{
@@ -1049,6 +1055,11 @@ export default {
               this.$nextTick(() => {
                 console.log('新增根据编号获取备件库存数量', response.data.list[0])
                 item = response.data.list[0]
+                if(this.dialogStatus==='special' && this.createTemp.purchaseType == '2'){
+                  this.$set(item,'price','')
+                }else if(this.dialogStatus==='special' && this.createTemp.purchaseType == '3'){
+                  this.$set(item,'price','0')
+                }
                 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)
@@ -1069,6 +1080,11 @@ export default {
             this.$nextTick(() => {
               console.log('新增根据编号获取备件库存数量', response.data.list[0])
               item = response.data.list[0]
+              if(this.dialogStatus==='special' && this.createTemp.purchaseType == '2'){
+                this.$set(item,'price','')
+              }else if(this.dialogStatus==='special' && this.createTemp.purchaseType == '3'){
+                this.$set(item,'price','0')
+              }
               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)
@@ -1085,6 +1101,7 @@ export default {
         }
         this.$forceUpdate()
       } else {
+        console.log(2222222222)
         if (this.listAdd.length > 0) {
           if (this.listAdd.find(obj => obj.partId == item.partId)) {
             this.$message({ type: 'warning', message: '此备件已存在，请重新选择备件' })
@@ -1657,6 +1674,7 @@ export default {
           this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote
           PostDataByName(this.requestParam).then(response => {
             console.log('审核确认发送参数', this.requestParam)
+            this.isokDisable = false
             if (response.msg !== 'fail') {
               this.get_table_data()
               this.dialogFormVisible_Examine = false
@@ -1711,6 +1729,7 @@ export default {
           this.requestParam.parammaps.empId	 = Cookies.get('employeid')
           this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote
           PostDataByName(this.requestParam).then(response => {
+            this.isokDisable = false
             console.log('审核确认发送参数', this.requestParam)
             if (response.msg !== 'fail') {
               this.get_table_data()
@@ -1766,6 +1785,7 @@ export default {
           this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote
           PostDataByName(this.requestParam).then(response => {
             console.log('审核确认发送参数', this.requestParam)
+            this.isokDisable = false
             if (response.msg !== 'fail') {
               this.get_table_data()
               this.dialogFormVisible_Examine = false
@@ -1833,6 +1853,7 @@ export default {
             }}
           }
           ExecDataByConfig(this.requestParam).then(response => {
+            this.isokDisable = false
             if (response.msg !== 'fail') {
               this.get_table_data()
               this.dialogFormVisible_Examine = false
@@ -1893,6 +1914,7 @@ export default {
             }}
           }
           ExecDataByConfig(this.requestParam).then(response => {
+            this.isokDisable = false
             if (response.msg !== 'fail') {
               this.get_table_data()
               this.dialogFormVisible_Examine = false
@@ -1942,6 +1964,7 @@ export default {
           this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote
           PostDataByName(this.requestParam).then(response => {
             console.log('审核确认发送参数', this.requestParam)
+            this.isokDisable = false
             if (response.msg !== 'fail') {
               this.get_table_data()
               this.dialogFormVisible_Examine = false
@@ -2070,16 +2093,17 @@ export default {
         let data = {
           "pastureId": parseInt(this.createTemp.pastureId),
           "departmentId": parseInt(this.createTemp.departmentId),
+          'departmentName':this.createTemp.departmentName,
           "orderNumber": this.createTemp.orderNumber,
           "createTime": this.createTemp.createTime,
           "employeId": this.createTemp.employeId,
+          "providerName": this.createTemp.providerName,
           "purchaseType": parseInt(this.createTemp.purchaseType),
           "spot_list":this.listAdd
         }
-        if(this.createTemp.purchaseType == '2'){
-          data.providerName =  this.createTemp.providerName
-        }else{
+        if(this.createTemp.purchaseType == '1' || this.createTemp.purchaseType == '3'){
           data.providerId = this.createTemp.providerId
+          data.providerName =  this.providerList.find(obj => obj.id == this.createTemp.providerId).providerName
         }
         if(this.createTemp.funderId){
           data.funderId = this.createTemp.funderId

src/views/report/maintenanceFault/index.vue

@@ -359,6 +359,7 @@ export default {
     goFirst() {
       console.log("goFirst")
       this.tableObj.getdataListParm.offset = 1
+      this.tableObj.getdataListParm.parammaps.eqClassPIdStr = ''
       this.tableObj.getdataListParm.parammaps.level = "1"
       this.tableObj.getdataListParm.parammaps.eqName = ''
       this.tableObj.getdataListParm.parammaps.eqClassId = ''
@@ -543,6 +544,8 @@ export default {
       this.eqClassName = row.eqClassName
       this.tableObj.getdataListParm.parammaps.offset = 1
       this.tableObj.getdataListParm.parammaps.level = "2"
+      this.tableObj.getdataListParm.parammaps.eqClassPIdStr = row.eqId
+      this.tableObj.getdataListParm.parammaps.eqClassId = ''
       this.get_table_data()
     }