Merge branch 'dev' into master

# Conflicts:
#	src/store/modules/user.js

src/store/modules/user.js

@@ -113,6 +113,8 @@ const actions = {
               getCommonCode({ pCid: 66542 }).then(res => {
                 if (res.code !== -1) {
                   const parmasary = res.result[0].codeList
+                  debugger
+                  console.warn('process.envprocess.envprocess.env', process.env)
                   let tokenObj = {}
                   if (process.env.NODE_ENV != 'production') {
                     tokenObj = {
@@ -160,27 +162,27 @@ const actions = {
                 }
               }).then(data => {
                 console.log('参数：', data, arcgisTokenObject, response)
-                if (process.env.NODE_ENV != 'production') {
-                // reject()
-                  const token = tempAry.filter(item => {
-                    return item.ccode == 'token'
-                  })[0]
-                  token.cname = arcgisTokenObject.token
-                  const expires = tempAry.filter(item => {
-                    return item.ccode == 'expires'
-                  })[0]
-                  expires.cname = arcgisTokenObject.expires
+                // if (process.env.NODE_ENV != 'production') {
+                const token = tempAry.filter(item => {
+                  return item.ccode == 'token'
+                })[0]
+                token.cname = arcgisTokenObject.token
+                const expires = tempAry.filter(item => {
+                  return item.ccode == 'expires'
+                })[0]
+                expires.cname = arcgisTokenObject.expires
 
-                  // editDictionary(token).then((res) => {
-                  //   console.log('token', res)
-                  //   return editDictionary(expires)
-                  // }).then((res) => {
-                  //   console.log('expires', res)
-                  //   resolve(response)
-                  // }).catch(error => {
-                  //   throw error
-                  // })
-                }
+                editDictionary(token).then((res) => {
+                  console.log('token', res)
+                  return editDictionary(expires)
+                }).then((res) => {
+                  console.log('expires', res)
+                  resolve(response)
+                }).catch(error => {
+                  reject(error)
+                  throw error
+                })
+                // }
               })
             } else {
               commit('SET_ARCGISTOKEN', arcgisToken)

src/views/dcSystem/installationProcess/process/settlementAccount/formDialog.vue

@@ -242,7 +242,9 @@ export default {
         collectionTime: [{ required: true, message: '请输入收款时间', trigger: 'blur' }],
         auditPersonId: [{ required: true, message: '请选择审核人', trigger: 'blur' }]
       },
-      settlementAccountForm: {},
+      settlementAccountForm: {
+        remark: '无'
+      },
       disabled: false,
       fileList: [],
       optionData: [],
@@ -285,7 +287,8 @@ export default {
             '{y}-{m}-{d} {h}:{i}:{s}'
           ),
           registerUser: this.checkData[9].approvalPersonName || sessionStorage.getItem('realName'),
-          approvalSuggest: this.checkData[9].approvalSuggest
+          approvalSuggest: this.checkData[9].approvalSuggest,
+          remark: ''
         }
         this.list = this.checkData[9].histroy.filter(e => {
           return (e.approvalStatus == 2 && e.nodeAlias == 'managerApproval')
@@ -297,7 +300,8 @@ export default {
       this.settlementAccountForm = {
         registerDate: this.checkData[9].approvalTime ? this.checkData[9].approvalTime.slice(0, 10) : '',
         registerUser: this.checkData[9].approvalPersonName,
-        approvalSuggest: this.checkData[9].approvalSuggest
+        approvalSuggest: this.checkData[9].approvalSuggest,
+        remark: ''
       }
       if (this.checkData[9].histroy) {
         this.list = this.checkData[9].histroy.filter(e => {
@@ -316,7 +320,9 @@ export default {
     // 获取数据
     async getData() {
       // 初始化数据
-      const settlementAccountForm = {}
+      const settlementAccountForm = {
+        remar: ''
+      }
 
       // 调用接口
       const form = await queryFormData(this.settlementAccountFormId)