Merge remote-tracking branch 'origin/dev' into dev

components/file/file-manage/FileManageCont.vue

@@ -117,7 +117,7 @@ export default {
           this.urlData = {
             msg: 'FoodSubContractAttachment',
             pageUrl: '/meter/v1/contract_attachment/page',
-            deleteUrl: 'FoodSubContractAttachment/deleteByIds',
+            deleteUrl: '/meter/v1/contract_attachment/?ids=',
             uploadFileUrl: '/meter/v1/contract_attachment/upload/',
             downloadFileUrl: '/meter/v1/contract_attachment/download/',
             downloadBatch: '/food/v1/subcontractor_attachment/download_batch',

components/file/file-manage/FilesList.vue

@@ -164,7 +164,10 @@ export default {
         { title: '上传时间', key: 'ctime', width: 140, dateTime: true }
         // {title: '上传人', key: 'cname', width: 120},
       ],
-      formObj: {},
+      formObj: {
+        contractId: '',
+        entrustId: ''
+      },
       viewVal: 1,
       viewStyle: 1,
       menusList: [
@@ -204,13 +207,15 @@ export default {
       this.imgViewIndex = null
       this.isLoad = false
       this.id = data.id
+      this.formObj.contractId = data.id
+      this.formObj.entrustId = data.id
       // 各个ids
       this.idsObj = idsObj
       this.urlData = data
       this.action = global.baseURL + data.uploadFileUrl + data.id
-      // this.$nextTick(() => {
-      //   this._page()
-      // })
+      this.$nextTick(() => {
+        this._page()
+      })
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())

env/.env.production

 // 请求地址
-WEB_URL=http://sys.patzn.com
+WEB_URL=http://meter.patzn.com
 BASE_URL=http://api.patzn.com
 SSO_URL=http://sso.patzn.com
 STATIC_URL=http://static.patzn.com
-NC_URL=http://192.168.81.76:8088
+NC_URL=http://123.133.38.68:8088

pages/meter-entrust/client-online/MeterClientOnlineEntrust.vue

@@ -260,7 +260,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'subcontractorId')
+      this.$refs.FileManage._open(id, 'contractId')
     },
     _getById: async function(id) {
       const result = await meterEntrust.getVOById(id)

pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue

@@ -253,7 +253,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'subcontractorId')
+      this.$refs.FileManage._open(id, 'contractId')
     },
     _getById: async function(id) {
       const result = await meterEntrust.getVOById(id)

pages/meter-entrust/send-test/MeterSendEntrust.vue

@@ -249,7 +249,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'subcontractorId')
+      this.$refs.FileManage._open(id, 'contractId')
     },
     _getById: async function(id) {
       const result = await meterEntrust.getVOById(id)

pages/meter-review/MeterReviewEntrust.vue

@@ -323,7 +323,7 @@ export default {
 
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'subcontractorId')
+      this.$refs.FileManage._open(id, 'contractId')
     },
     _getById: async function(id) {
       const result = await meterSubcontractor.getById(id)