1.备件库存下拉删除垫付；2.备件出库删除青贮单号；3.备件采购删除垫付；4.备件入库删除垫付；5.备件申购删除垫付6.维修新增保存必填校验

.env.development

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

src/views/custom/custom/index.vue

@@ -703,7 +703,7 @@ export default {
       //   }
       // },
       // ------------------------------------------
-      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:2,name:'垫付'},{id:3,name:'赠品'}],//申购状态
+      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:3,name:'赠品'}],//申购状态
       customList: [{ id: 0, name: '全部库存' }, { id: 1, name: '库存不为零' }],
       isCustomTemplate: [], isCustomImport: [], isCustomExport: [], isCustomSee: [],isCustomChange:[],
       findAllProvider: [],

src/views/custom/outStock/index.vue

@@ -390,11 +390,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="No2 && createTemp.useType == 6" :span="8">
+            <!-- <el-col v-if="No2 && createTemp.useType == 6" :span="8">
               <el-form-item label="青贮单号：" prop="greenFodderNumber">
                 <el-input ref="greenFodderNumber" v-model="createTemp.greenFodderNumber" maxlength="20" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col v-if="isReceiveTime2" :span="8">
               <el-form-item label="出库日期：" prop="receiveTime">
                 <el-date-picker
@@ -791,12 +791,12 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="seeTemp.useType == 6">
+           <!-- <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-col> -->
+            <el-col :span="8">
               <el-form-item v-if="oddCodeAllo" label="领用单号：" prop="oddCode">
                 <el-input ref="oddCode" v-model="seeTemp.oddCode" disabled />
               </el-form-item>

src/views/custom/purchase/index.vue

@@ -662,7 +662,6 @@
             <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-if="scope.row.purchase_type == 3">赠品</span>
                 <span v-else>正常</span>
               </template>
@@ -1490,7 +1489,7 @@ export default {
       listLoading3: false,
       tableKey3: 0,
       list3: [],
-      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:2,name:'垫付'},{id:3,name:'赠品'}],//申购状态
+      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:3,name:'赠品'}],//申购状态
       findAllEmploye: [],
       findAllPasture: [],
       requestParams: [

src/views/custom/storage/index.vue

@@ -114,7 +114,6 @@
             <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-if="scope.row.purchase_type == 3">赠品</span>
                 <span v-else>正常</span>
               </template>
@@ -777,7 +776,7 @@ export default {
           return time.getTime() > Date.now()// 当天之前的时间可选
         }
       },
-      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:2,name:'垫付'},{id:3,name:'赠品'}],//申购状态
+      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:3,name:'赠品'}],//申购状态
       dialogFormVisible: false,
       dialogFormVisible_See: false,
       dialogStatus: '',

src/views/custom/subscribe/index.vue

@@ -84,7 +84,6 @@
       <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-if="scope.row.purchase_type == 3">赠品</span>
           <span v-else>正常</span>
         </template>
@@ -214,7 +213,7 @@
             <el-col :span="24">
               <el-form-item label="申购类型：" prop="purchaseType">
                 <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-radio v-model="createTemp.purchaseType" label="2" @change="changeType()">垫付</el-radio> -->
                 <el-radio v-model="createTemp.purchaseType" label="3" @change="changeType()">赠品</el-radio>
               </el-form-item>
             </el-col>
@@ -283,6 +282,7 @@
             <template slot-scope="scope">
               <span v-if="dialogStatus==='create'">{{ scope.row.brandName }}</span>
               <span v-if="dialogStatus==='update'">{{ scope.row.brandName }}</span>
+              <span v-if="dialogStatus==='special'">{{ scope.row.brandName }}</span>
             </template>
           </el-table-column>
           <el-table-column label="计量单位" prop="unit" align="center" min-width="60">
@@ -297,7 +297,7 @@
           </el-table-column>
           <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' || createTemp.purchaseType == '3'">{{ scope.row.price }}</span>
+              <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" />
@@ -415,7 +415,7 @@
             <el-col :span="24">
               <el-form-item label="申购类型：" prop="purchaseType">
                 <el-radio v-model="seeTemp.purchaseType" disabled label="1">暂估</el-radio>
-                <el-radio v-model="seeTemp.purchaseType" disabled label="2">垫付</el-radio>
+                <!-- <el-radio v-model="seeTemp.purchaseType" disabled label="2">垫付</el-radio> -->
                 <el-radio v-model="seeTemp.purchaseType" disabled label="3">赠品</el-radio>
               </el-form-item>
             </el-col>
@@ -596,7 +596,7 @@ export default {
       findAllPasture: [],
       findAllDepart: [],
       findAllEmploye: [],
-      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:2,name:'垫付'},{id:3,name:'赠品'}],//申购状态
+      subscriptionStatusList:[{id:0,name:'正常'},{id:1,name:'暂估'},{id:3,name:'赠品'}],//申购状态
       onlineSubscriptionList: [], createDepartList: [], edit: 0,
       requestParams: [
         { name: 'findAllProvider', offset: 0, pagecount: 0, params: [] },
@@ -1007,16 +1007,20 @@ export default {
     sparePartSearch(queryString, cb) {
       console.log('备件模糊查询输入值', queryString)
       if(this.dialogStatus==='special'){
-        if(this.createTemp.providerId !== '' && this.createTemp.purchaseType !== '3'){
-          this.requestSparePart.name = 'getPartsListSG'
-          this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
-        }else{
-          if(this.createTemp.purchaseType == 1){
+        if(this.createTemp.purchaseType == 1 || this.createTemp.purchaseType == '3'){
+          if(this.createTemp.providerId == ''){
             this.$message({ type: 'warning', message: '请选择供应商' })
             return false;
           }else{
-            this.requestSparePart.name = 'getPartsListSG'
-            this.requestSparePart.parammaps['providerId'] = ''
+            if(this.createTemp.purchaseType == '3'){
+              this.requestSparePart.name = 'getStockListByGiveaway'
+              this.requestSparePart.parammaps['providerName'] = this.providerList.find(obj => obj.id == this.createTemp.providerId).providerName
+              this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
+              this.requestSparePart.parammaps['pastureId'] = this.createTemp.pastureId
+            }else{
+              this.requestSparePart.name = 'getPartsListSG'
+              this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
+            }
           }
         }
       }else{
@@ -1896,7 +1900,7 @@ export default {
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
-      }, 1000)
+      }, 10000)
       this.$refs['examineTemp'].validate(valid => {
         if (valid) {
           this.requestParam = {}
@@ -1957,7 +1961,7 @@ export default {
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
-      }, 1000)
+      }, 10000)
       this.$refs['examineTemp'].validate(valid => {
         if (valid) {
           this.requestParam = {}
@@ -2099,6 +2103,9 @@ export default {
           }
         }
         let url = 'authdata/spare/parts/requisitions'
+        for(let i=0;i<this.listAdd.length;i++){
+          this.$set(this.listAdd[i],'contractId',String(this.listAdd[i].contractId))
+        }
         let data = {
           "pastureId": parseInt(this.createTemp.pastureId),
           "departmentId": parseInt(this.createTemp.departmentId),

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

@@ -788,6 +788,18 @@ export default {
 
         for (var j = 0; j < this.listAddCont.length; j++) {
           console.log(this.listAddCont[j].amount)
+          if(this.listAddCont[j].providerName == ''){
+            this.$message({ type: 'warning', message: '请检查供应商是否未填写', duration: 2000 })
+            return false
+          }
+          if(this.listAddCont[j].eqName == ''){
+            this.$message({ type: 'warning', message: '请检查设备名称是否未填写', duration: 2000 })
+            return false
+          }
+          if(this.listAddCont[j].eqCode == ''){
+            this.$message({ type: 'warning', message: '请检查设备内部编号是否未填写', duration: 2000 })
+            return false
+          }
           if (this.listAddCont[j].amount == null || this.listAddCont[j].amount === '') {
             // this.$message({ type: 'warning', message: '请检查金额是否未填写', duration: 2000 })
             // return false