Browse Source

修正设备基础信息不加载问题、多个删除接口增加参数

Epans 2 years ago
parent
commit
74ee462ee4

BIN
dist-现代牧业-正式地址-20221119-1.zip


BIN
dist-现代牧业-正式地址-20221119.zip


BIN
dist-现代牧业-正式地址-20221121-1.zip


BIN
dist-现代牧业-正式地址-20221121-2.zip


BIN
dist-现代牧业-测试地址-20221119-1.zip


BIN
dist-现代牧业-测试地址-20221119.zip


BIN
dist-现代牧业-测试地址-20221121-1.zip


BIN
dist-现代牧业-测试地址-20221121-2.zip


BIN
dist-现代牧业-测试地址-20221121-3.zip


BIN
dist-现代牧业-测试地址-20221121-4.zip


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


+ 17 - 11
src/views/asset/basics/index.vue

@@ -207,7 +207,7 @@
     </el-tabs>
 
     <!-- 新增 -->
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible"  v-show = "dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-add">
         <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="115px" style="width: 90%;margin:0 auto 30px">
           <el-row>
@@ -232,7 +232,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="资产编号:" prop="assetCode">
-                <el-input ref="assetCode" v-model="createTemp.assetCode" placeholder="请输入编号" disabled @popoverHide="popoverHide" />
+                <el-input ref="assetCode" v-model="createTemp.assetCode" placeholder="请输入编号" disabled   />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -995,7 +995,7 @@ export default {
     return {
       isBasicsAdd: [], isBasicsCard: [], isBasicsUpdate: [], isBasicsDel: [], isBasicsDel2: [], isBasic: [], isBasicSH: [], isBasicExamine: [],
       rules: {
-        assetCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        // assetCode: [{ required: true, message: '必填', trigger: 'blur' }],
         eqName: [{ required: true, message: '必填', trigger: 'blur' }],
         eqCode: [{ required: true, message: '必填', trigger: 'blur' }],
         financeCode: [{ required: true, message: '必填', trigger: 'blur' }],
@@ -1198,13 +1198,13 @@ export default {
   },
   computed: {
     // 设置请求头
-    headers() {
-      return {
-        // 设置token
-        // eslint-disable-next-line no-undef
-        token: getToken()
-      }
-    },
+    // headers() {
+    //   return {
+    //     // 设置token
+    //     // eslint-disable-next-line no-undef
+    //     token: getToken()
+    //   }
+    // },
     uploadData() {
       return {
         name: 'importStockUse',
@@ -1773,7 +1773,7 @@ export default {
       this.createTemp.yearUpkeepCost = ''
       this.createTemp.yearMaintainDost = ''
       this.createTemp.yuanzhi = ''
-      this.createTemp.assetCode = ''
+ 
       this.createTemp.baseHours = ''
       this.createTemp.upkeepgrade = 113
       this.createTemp.salvage = ''
@@ -2602,7 +2602,13 @@ export default {
     getEQNumber() {
       this.getdataEQNumber.parammaps.pastureId = Cookies.get('pastureid')
       GetDataByName(this.getdataEQNumber).then(response => {
+
+        
         this.createTemp.assetCode = response.data.list[0].createNumber
+        console.log(response.data.list[0].createNumber)
+        console.log(this.createTemp.assetCode)
+        this.$forceUpdate()
+        
       })
     },
 

+ 24 - 1
src/views/custom/outStock/index.vue

@@ -1315,6 +1315,28 @@ export default {
       return process.env.VUE_APP_BASE_API + 'authdata/ImportExcel'
     }
   },
+
+  watch: {
+ 
+    listAdd: {
+      deep: true,
+      handler: function (item) {
+
+          this.listAdd.forEach(function(i){
+            if(parseInt(i.checkoutNumber) > parseInt(i.amount)){
+              i.checkoutNumber = i.amount
+            }
+            if(parseInt(i.checkoutNumber) > parseInt(i.reportery)){
+              i.checkoutNumber = i.reportery
+            }
+                
+          })
+
+            
+      }
+    },
+
+  },
   created() {
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
@@ -2843,7 +2865,8 @@ export default {
         this.postDataPramas.data[0].children[0] = { 'name': 'updatePartRepertoryDelCK', 'type': 'e', 'parammaps': {
           id: '@insertSpotList.id',
           contractId: '@insertSpotList.contractId',
-          partCode: '@insertSpotList.partCode'
+          partCode: '@insertSpotList.partCode',
+          pastureId: row.pastureId
         }}
         this.postDataPramas.data[0].children[1] = { 'name': 'deletePartUse', 'type': 'e', 'parammaps': {
           id: '@insertSpotList.id'

+ 2 - 1
src/views/custom/retreat/index.vue

@@ -1312,7 +1312,8 @@ export default {
           quitNumber: '@insertSpotList.quitNumber',
           providerId: '@insertSpotList.providerId',
           partCode: '@insertSpotList.partCode',
-          contractId: '@insertSpotList.contractId'
+          contractId: '@insertSpotList.contractId',
+          pastureId: row.pastureId
         }}
         this.postDataPramas.data[0].children[1] = { 'name': 'deletePartQuit', 'type': 'e', 'parammaps': {
           id: '@insertSpotList.id'

+ 2 - 1
src/views/custom/storage/index.vue

@@ -2101,7 +2101,8 @@ export default {
         this.postDataPramas.data[0].children[0] = { 'name': 'updatePartRepertoryDel', 'type': 'e', 'parammaps': {
           id: '@insertSpotList.id',
           contractId: '@insertSpotList.contractId',
-          partCode: '@insertSpotList.partCode'
+          partCode: '@insertSpotList.partCode',
+          pastureId: row.pastureId
         }}
         this.postDataPramas.data[0].children[1] = { 'name': 'deletePartLaid', 'type': 'e', 'parammaps': {
           id: '@insertSpotList.id'

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