## Fix - 信息管理->会员信息->安置编号

.env.development

@@ -1,10 +1,10 @@
 # just a flag
 ENV = 'development'
 # base api
-# VUE_APP_BASE_API = 'http://f.hzs413.com/inter-api'
+# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_ADDRESS = 'http://f.hzs413.com/'
+VUE_APP_ADDRESS = 'http://af-app.beida413.com/'
-VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/online/language'
+VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
-VUE_APP_BASE_INTERAPI2 = 'http://f.hzs413.com/language'
+VUE_APP_BASE_INTERAPI2 = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
 
 
-VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = '/prod-api'

.env.production

@@ -4,11 +4,11 @@ ENV = 'production'
 # base api
 # VUE_APP_BASE_API = 'http://f.hzs413.com/prod-api'
 # VUE_APP_ADDRESS = 'http://f.hzs413.com/'
-# VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+# VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
 # VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
 
 
-VUE_APP_BASE_API = 'http://13.247.98.15/inter-api'
+VUE_APP_BASE_API = '/prod-api'
-VUE_APP_ADDRESS = 'http://13.247.98.15/'
+VUE_APP_ADDRESS = 'http://af.angelo413.com/'
-VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_INTERAPI = 'https://agl413-test.s3.af-south-1.amazonaws.com/test'
-VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_INTERAPI2 = 'http://ma.angelo413.com/lang'

.env.test

@@ -2,7 +2,8 @@
 ENV = 'test'
 
 # base api
-VUE_APP_BASE_API = 'http://f.hzs413.com/inter-api/'
+VUE_APP_ADDRESS = 'http://af-app.beida413.com/'
-VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
+VUE_APP_BASE_INTERAPI2 = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
 VUE_APP_BASE_AREA = ''

public/index.html

@@ -11,7 +11,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <link rel="icon" href="<%= BASE_URL %>fave.png">
+  <link rel="icon" href="<%= BASE_URL %>tab-icon.png">
   <title>
     <%= webpackConfig.name %>
   </title>

src/App.vue

@@ -11,11 +11,11 @@
 </template>
 
 <script>
-import { env } from "echarts";
+import { env } from 'echarts'
 export default {
-  name: "App",
+  name: 'App',
   data() {
-    return {};
+    return {}
   },
   beforeCreate() {
     // var localEnUS = {}
@@ -29,149 +29,149 @@ export default {
     // console.log('xxxxxxxxxxxxxxx')
   },
   created() {
-    const self = this;
+    const self = this
-    self.loading = false;
+    self.loading = false
-    self.addScriptChild("zh-CN");
+    self.addScriptChild('zh-CN')
-    self.addScriptChild("en-US");
+    self.addScriptChild('en-US')
-    self.addScriptChild("ru-RU");
+    // self.addScriptChild("ru-RU");
-    self.addScriptChild("fr-FR");
+    self.addScriptChild('fr-FR')
-    if (process.env.NODE_ENV != "production") {
+    if (process.env.NODE_ENV != 'production') {
       // self.addScriptChild("fr-FR");
       // self.addScriptChild("pt-PT");
     }
   },
   methods: {
     addScriptChild2(name) {
-      const self = this;
+      const self = this
-      const s = document.createElement("script");
+      const s = document.createElement('script')
-      s.type = "text/javascript";
+      s.type = 'text/javascript'
-      const base_url = process.env.VUE_APP_BASE_INTERAPI2;
+      const base_url = process.env.VUE_APP_BASE_INTERAPI2
-      s.src = base_url + "/" + name + ".js";
+      s.src = base_url + '/' + name + '.js'
-      s.ref = "local1";
+      s.ref = 'local1'
-      document.body.appendChild(s);
+      document.body.appendChild(s)
 
-      if (window.ActiveXObject || "ActiveXObject" in window) {
+      if (window.ActiveXObject || 'ActiveXObject' in window) {
         // 判断是否是ie
         if (s.readyState) {
           // 判断是否支持readyState
-          s.onreadystatechange = function () {
+          s.onreadystatechange = function() {
-            if (this.readyState == "loaded" || this.readyState == "complete") {
+            if (this.readyState == 'loaded' || this.readyState == 'complete') {
-              self.readyAdd(name);
+              self.readyAdd(name)
-              console.log("ie10及以下加载完成");
+              console.log('ie10及以下加载完成')
+            }
           }
-          };
         } else {
-          s.onload = function () {
+          s.onload = function() {
-            self.readyAdd(name);
+            self.readyAdd(name)
-            console.log("ie11及Edge加载完成");
+            console.log('ie11及Edge加载完成')
-          };
+          }
-          s.onerror = function () {
+          s.onerror = function() {
-            console.log("ie11及Edge加载第二地址失败:" + name);
+            console.log('ie11及Edge加载第二地址失败:' + name)
-          };
+          }
         }
       } else {
         // 不是ie
-        s.onload = function () {
+        s.onload = function() {
-          self.readyAdd(name);
+          self.readyAdd(name)
-          console.log("非ie浏览器第二地址加载完成:" + name);
+          console.log('非ie浏览器第二地址加载完成:' + name)
-        };
+        }
-        s.onerror = function () {
+        s.onerror = function() {
-          console.log("非ie浏览器加载第二地址失败:" + name);
+          console.log('非ie浏览器加载第二地址失败:' + name)
-        };
+        }
       }
     },
     addScriptChild(name) {
-      const self = this;
+      const self = this
-      const s = document.createElement("script");
+      const s = document.createElement('script')
-      s.type = "text/javascript";
+      s.type = 'text/javascript'
-      const base_url = process.env.VUE_APP_BASE_INTERAPI;
+      const base_url = process.env.VUE_APP_BASE_INTERAPI
-      s.src = base_url + "/" + name + ".js";
+      s.src = base_url + '/' + name + '.js'
-      s.ref = "local1";
+      s.ref = 'local1'
-      document.body.appendChild(s);
+      document.body.appendChild(s)
 
-      if (window.ActiveXObject || "ActiveXObject" in window) {
+      if (window.ActiveXObject || 'ActiveXObject' in window) {
         // 判断是否是ie
         if (s.readyState) {
           // 判断是否支持readyState
-          s.onreadystatechange = function () {
+          s.onreadystatechange = function() {
-            if (this.readyState == "loaded" || this.readyState == "complete") {
+            if (this.readyState == 'loaded' || this.readyState == 'complete') {
-              self.readyAdd(name);
+              self.readyAdd(name)
-              console.log("ie10及以下加载完成");
+              console.log('ie10及以下加载完成')
+            }
           }
-          };
         } else {
-          s.onload = function () {
+          s.onload = function() {
-            self.readyAdd(name);
+            self.readyAdd(name)
-            console.log("ie11及Edge加载完成");
+            console.log('ie11及Edge加载完成')
-          };
+          }
-          s.onerror = function () {
+          s.onerror = function() {
-            console.log("ie11及Edge加载失败:" + name);
+            console.log('ie11及Edge加载失败:' + name)
-            self.addScriptChild2(name);
+            self.addScriptChild2(name)
-          };
+          }
         }
       } else {
         // 不是ie
-        s.onload = function () {
+        s.onload = function() {
-          self.readyAdd(name);
+          self.readyAdd(name)
-          console.log("非ie浏览器加载完成");
+          console.log('非ie浏览器加载完成')
-        };
+        }
-        s.onerror = function () {
+        s.onerror = function() {
-          console.log("非ie浏览器加载失败:" + name);
+          console.log('非ie浏览器加载失败:' + name)
-          self.addScriptChild2(name);
+          self.addScriptChild2(name)
-        };
+        }
       }
     },
     getJS(res, name) {
       const funcStr =
-        "function test(value){" + res.data + ";return " + name + "}";
+        'function test(value){' + res.data + ';return ' + name + '}'
-      const test = eval("(false || " + funcStr + ")");
+      const test = eval('(false || ' + funcStr + ')')
-      return test();
+      return test()
     },
     readyAdd(name) {
-      if (name === "zh-CN") {
+      if (name === 'zh-CN') {
         if (zhCN) {
-          const localzhCN = this.getJS(zhCN, "zhCN");
+          const localzhCN = this.getJS(zhCN, 'zhCN')
-          var STlocalzhCN = JSON.stringify(localzhCN);
+          var STlocalzhCN = JSON.stringify(localzhCN)
-          localStorage.setItem("local-zhCN", STlocalzhCN);
+          localStorage.setItem('local-zhCN', STlocalzhCN)
         }
-        this.$i18n.mergeLocaleMessage(name, zhCN);
+        this.$i18n.mergeLocaleMessage(name, zhCN)
       }
-      if (name === "en-US") {
+      if (name === 'en-US') {
         if (enUS) {
-          const localEnUS = this.getJS(enUS, "enUS");
+          const localEnUS = this.getJS(enUS, 'enUS')
-          var STlocalEnUS = JSON.stringify(localEnUS);
+          var STlocalEnUS = JSON.stringify(localEnUS)
-          localStorage.setItem("local-enUS", STlocalEnUS);
+          localStorage.setItem('local-enUS', STlocalEnUS)
         }
-        this.$i18n.mergeLocaleMessage(name, enUS);
+        this.$i18n.mergeLocaleMessage(name, enUS)
       }
-      if (name === "ru-RU") {
+      if (name === 'ru-RU') {
         if (ruRU) {
-          const localruRU = this.getJS(ruRU, "ruRU");
+          const localruRU = this.getJS(ruRU, 'ruRU')
-          var STlocalruRU = JSON.stringify(localruRU);
+          var STlocalruRU = JSON.stringify(localruRU)
-          localStorage.setItem("local-ruRU", STlocalruRU);
+          localStorage.setItem('local-ruRU', STlocalruRU)
         }
-        this.$i18n.mergeLocaleMessage(name, ruRU);
+        this.$i18n.mergeLocaleMessage(name, ruRU)
       }
-      if (name === "fr-FR") {
+      if (name === 'fr-FR') {
         if (frFR) {
-          const localfrFR = this.getJS(frFR, "frFR");
+          const localfrFR = this.getJS(frFR, 'frFR')
-          var STlocalfrFR = JSON.stringify(localfrFR);
+          var STlocalfrFR = JSON.stringify(localfrFR)
-          localStorage.setItem("local-frFR", STlocalfrFR);
+          localStorage.setItem('local-frFR', STlocalfrFR)
         }
-        this.$i18n.mergeLocaleMessage(name, frFR);
+        this.$i18n.mergeLocaleMessage(name, frFR)
       }
-      if (name === "pt-PT") {
+      if (name === 'pt-PT') {
         if (ptPT) {
-          const localptPT = this.getJS(ptPT, "ptPT");
+          const localptPT = this.getJS(ptPT, 'ptPT')
-          var STlocalptPT = JSON.stringify(localptPT);
+          var STlocalptPT = JSON.stringify(localptPT)
-          localStorage.setItem("local-ptPT", STlocalptPT);
+          localStorage.setItem('local-ptPT', STlocalptPT)
         }
-        this.$i18n.mergeLocaleMessage(name, ptPT);
+        this.$i18n.mergeLocaleMessage(name, ptPT)
       }
       // document.title = this.$t('HTML_TITL')
-    },
+    }
-  },
+  }
-};
+}
 </script>
 <style lang="scss">
 .el-dialog__header {

src/assets/i18n/index.js

@@ -34,7 +34,7 @@ if (localStorage.getItem('local-ptPT') != undefined) {
 import enLocale from 'element-ui/lib/locale/lang/en'
 import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 import ElementLocale from 'element-ui/lib/locale'
-import ruLocale from 'element-ui/lib/locale/lang/ru-RU'
+// import ruLocale from 'element-ui/lib/locale/lang/ru-RU'
 import frLocale from 'element-ui/lib/locale/lang/fr'
 import ptLocale from 'element-ui/lib/locale/lang/pt'
 const lang = localStorage.getItem('lang') || 'en-US'
@@ -57,10 +57,10 @@ const i18n = new VueI18n({
       ...localenUS,
       ...enLocale
     },
-    'ru-RU': {
+    // 'ru-RU': {
-      ...localruRU,
+    //   ...localruRU,
-      ...ruLocale
+    //   ...ruLocale
-    },
+    // },
     'fr-FR': {
       ...localfrFR,
       ...frLocale

src/views/information/business/czzxqc.vue

@@ -2,9 +2,9 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="main">
       <div class="thetable">
         <div class="fontTitle">{{ $t("MN_F_T_14") }}</div>
@@ -13,11 +13,10 @@
           <div>
             <el-radio-group v-model="memberPetitionVo.signType">
               <el-radio
-                :label="item.value"
                 v-for="item in checkList"
                 :key="item.value"
-                >{{ item.label }}</el-radio
+                :label="item.value"
-              >
+              >{{ item.label }}</el-radio>
             </el-radio-group>
           </div>
         </div>
@@ -52,29 +51,28 @@
                     v-model="ctem.pkApprover"
                     filterable
                     size="mini"
-                    @change="getApprover"
                     :placeholder="$t('CK_KS_38')"
+                    @change="getApprover"
                   >
                     <el-option
                       v-for="item in approbalList"
                       :key="item.userId"
                       :label="item.nickName + '(' + item.deptName + ')'"
                       :value="item.userId"
-                    >
+                    />
-                    </el-option>
                   </el-select>
                 </span>
                 <span style="margin: 0 5px 5px 0">
                   <i
                     class="el-icon-remove-outline"
-                    @click.stop="delData"
                     style="font-size: 18px; margin-right: 5px"
-                  ></i>
+                    @click.stop="delData"
+                  />
                   <i
                     class="el-icon-circle-plus-outline"
                     style="font-size: 18px"
                     @click.stop="addData"
-                  ></i>
+                  />
                 </span>
               </div>
             </td>
@@ -92,29 +90,28 @@
                     v-model="ctem.pkSend"
                     filterable
                     size="mini"
-                    @change="getApprover2"
                     :placeholder="$t('CK_KS_38')"
+                    @change="getApprover2"
                   >
                     <el-option
                       v-for="item in userAllList"
                       :key="item.userId"
                       :label="item.nickName + '(' + item.deptName + ')'"
                       :value="item.userId"
-                    >
+                    />
-                    </el-option>
                   </el-select>
                 </span>
                 <span style="margin: 0 5px 5px 0">
                   <i
                     class="el-icon-remove-outline"
-                    @click.stop="delData2"
                     style="font-size: 18px; margin-right: 5px"
-                  ></i>
+                    @click.stop="delData2"
+                  />
                   <i
                     class="el-icon-circle-plus-outline"
                     style="font-size: 18px"
                     @click.stop="addData2"
-                  ></i>
+                  />
                 </span>
               </div>
             </td>
@@ -124,12 +121,11 @@
             <td colspan="3" style="padding: 0">
               <div style="height: 100%">
                 <el-input
+                  v-model="memberPetitionVo.remark"
                   type="textarea"
                   :rows="6"
                   :placeholder="$t('S_C_70')"
-                  v-model="memberPetitionVo.remark"
+                />
-                >
-                </el-input>
               </div>
             </td>
           </tr>
@@ -149,15 +145,13 @@
                     prop="memberCode"
                     :label="$t('MN_T_1')"
                     min-width="120px"
-                  >
+                  />
-                  </el-table-column>
                   <el-table-column
                     align="center"
                     prop="memberName"
                     :label="$t('CK_KS_14')"
                     min-width="100px"
-                  >
+                  />
-                  </el-table-column>
                   <el-table-column
                     align="center"
                     prop="paymentMethod"
@@ -166,25 +160,25 @@
                   >
                     <template slot-scope="scope">
                       <el-select
+                        v-model="scope.row.paymentMethod"
                         clearable
                         :placeholder="$t('CK_KS_38')"
                         disabled
-                        v-model="scope.row.paymentMethod"
                       >
                         <el-option
                           v-for="item in paymentTypeList"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value"
-                        ></el-option>
+                        />
                       </el-select>
                     </template>
                   </el-table-column>
 
                   <el-table-column
-                    min-width="100px"
                     v-for="(item, index) in enumsAccountList"
                     :key="index"
+                    min-width="100px"
                     align="center"
                     :prop="`${item.pkId}`"
                     :label="item.pkTransactionKeyVal"
@@ -202,15 +196,13 @@
                     prop="memberRemarks"
                     :label="$t('MN_F_T_593')"
                     min-width="120px"
-                  >
+                  />
-                  </el-table-column>
                   <el-table-column
                     align="center"
                     prop="remarks"
                     :label="$t('MN_F_T_594')"
                     min-width="120px"
-                  >
+                  />
-                  </el-table-column>
                 </el-table>
               </div>
             </td>
@@ -242,205 +234,203 @@
     <div class="footer">
       <div style="margin: 0 auto">
         <el-button class="thebtn" @click="cancelCz">
-          {{ $t("ENU_P_TYPE0") }}</el-button
+          {{ $t("ENU_P_TYPE0") }}</el-button>
-        >
         <el-button type="primary" class="thebtn" @click="saveDate">
-          {{ $t("MN_F_32") }}</el-button
+          {{ $t("MN_F_32") }}</el-button>
-        >
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import topBar from "@/components/topBar";
+import topBar from '@/components/topBar'
-import { rechargeFill, rechargePlFill } from "@/api/financial";
+import { rechargeFill, rechargePlFill } from '@/api/financial'
-import { getUserAll } from "@/api/signing";
+import { getUserAll } from '@/api/signing'
-import * as man from "@/api/manage";
+import * as man from '@/api/manage'
-import { mapGetters } from "vuex";
+import { mapGetters } from 'vuex'
-import { getenumsCzAccount, getpaymentType } from "@/api/financial";
+import { getenumsCzAccount, getpaymentType } from '@/api/financial'
 export default {
-  name: "Czzxqc",
+  name: 'Czzxqc',
   components: {
-    topBar,
+    topBar
   },
   computed: {
-    ...mapGetters(["getUser"]),
+    ...mapGetters(['getUser'])
   },
   data() {
     return {
-      moren: "czzxqc",
+      moren: 'czzxqc',
       topList: [
         {
-          name: this.$t("MN_F_T_1015"),
+          name: this.$t('MN_F_T_1015'),
-          path: "jcyw",
+          path: 'jcyw'
         },
         {
-          name: this.$t("MN_F_T_12"),
+          name: this.$t('MN_F_T_12'),
-          path: "ddyw",
+          path: 'ddyw'
         },
         {
-          name: "确认业务",
+          name: '确认业务',
-          path: "shyw",
+          path: 'shyw'
         },
         {
-          name: "在线签呈",
+          name: '在线签呈',
-          path: "czzxqc",
+          path: 'czzxqc'
-        },
+        }
       ],
       checked: [],
       checkList: [],
-      paymentTypeList: [], //交款方式
+      paymentTypeList: [], // 交款方式
-      enumsAccountList: [], //币种类型
+      enumsAccountList: [], // 币种类型
-      ywsq: "",
+      ywsq: '',
       ywsqList: [
-        { value: "0", label: "同意" },
+        { value: '0', label: '同意' },
-        { value: "1", label: "驳回" },
+        { value: '1', label: '驳回' }
       ],
       qcData: {},
       memberPetitionVo: {
         isSpecial: 0,
         signType: 1,
-        remark: "", //情况说明
+        remark: '', // 情况说明
-        userIdList: [{ pkApprover: "" }],
+        userIdList: [{ pkApprover: '' }],
-        sendIdList: [{ pkSend: "" }],
+        sendIdList: [{ pkSend: '' }],
-        rechargeMethod: "", //充值方式
+        rechargeMethod: '', // 充值方式
-        detailParams: [],
+        detailParams: []
       },
-      czlx: "", //单笔/批量
+      czlx: '', // 单笔/批量
       approbalList: [],
-      userAllList: [],
+      userAllList: []
-    };
+    }
   },
 
   created() {
-    this.getSignData();
+    this.getSignData()
   },
   methods: {
     getSignData() {
       getpaymentType().then((res) => {
-        this.paymentTypeList = res.data;
+        this.paymentTypeList = res.data
-      });
+      })
 
       man.signData(300).then((res) => {
-        this.qcData = res.data[0];
+        this.qcData = res.data[0]
-        this.memberPetitionVo.sendIdList = this.qcData.sendList;
+        this.memberPetitionVo.sendIdList = this.qcData.sendList
-        this.memberPetitionVo.userIdList = this.qcData.detailList;
+        this.memberPetitionVo.userIdList = this.qcData.detailList
         this.memberPetitionVo.detailParams = JSON.parse(
           this.$route.query.detailParams
-        );
+        )
         this.memberPetitionVo.rechargeMethod = JSON.parse(
           this.$route.query.rechargeMethod
-        );
+        )
-        this.isSpecial = this.$route.query.isSpecial;
+        this.isSpecial = this.$route.query.isSpecial
         if (this.isSpecial == 1) {
-          this.getenumsCzAccount();
+          this.getenumsCzAccount()
         } else {
-          this.getenumsCzAccount1();
+          this.getenumsCzAccount1()
         }
-        this.czlx = this.$route.query.czlx;
+        this.czlx = this.$route.query.czlx
-        this.getSignType();
+        this.getSignType()
-      });
+      })
     },
     getenumsCzAccount() {
       getenumsCzAccount().then((res) => {
-        this.enumsAccountList = res.rows;
+        this.enumsAccountList = res.rows
-      });
+      })
     },
     getenumsCzAccount1() {
       getenumsCzAccount({ accountProperty: 1 }).then((res) => {
-        this.enumsAccountList = res.rows;
+        this.enumsAccountList = res.rows
-      });
+      })
     },
     getSignType() {
       man.signType().then((res) => {
-        this.checkList = res.data;
+        this.checkList = res.data
-      });
+      })
       // 审批流程
       man.approvalUser().then((res) => {
-        this.approbalList = res.data;
+        this.approbalList = res.data
-      });
+      })
-      //抄送部门
+      // 抄送部门
       getUserAll().then((res) => {
-        this.userAllList = res.data;
+        this.userAllList = res.data
-      });
+      })
     },
     // 审批流程
     getApprover() {
       this.$nextTick(() => {
-        this.$forceUpdate();
+        this.$forceUpdate()
-      });
+      })
     },
     // 审批流程
     addData() {
-      let arr = JSON.parse(JSON.stringify(this.memberPetitionVo.userIdList));
+      const arr = JSON.parse(JSON.stringify(this.memberPetitionVo.userIdList))
-      arr.push({ pkApprover: "" });
+      arr.push({ pkApprover: '' })
-      this.$set(this.memberPetitionVo, "userIdList", arr);
+      this.$set(this.memberPetitionVo, 'userIdList', arr)
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     // 审批流程
     delData() {
-      this.memberPetitionVo.userIdList.pop();
+      this.memberPetitionVo.userIdList.pop()
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     // 抄送部门
     getApprover2() {
       this.$nextTick(() => {
-        this.$forceUpdate();
+        this.$forceUpdate()
-      });
+      })
     },
     // 抄送部门
     addData2() {
-      let arr2 = JSON.parse(JSON.stringify(this.memberPetitionVo.sendIdList));
+      const arr2 = JSON.parse(JSON.stringify(this.memberPetitionVo.sendIdList))
-      arr2.push({ pkSend: "" });
+      arr2.push({ pkSend: '' })
-      this.$set(this.memberPetitionVo, "sendIdList", arr2);
+      this.$set(this.memberPetitionVo, 'sendIdList', arr2)
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     // 抄送部门
     delData2() {
-      this.memberPetitionVo.sendIdList.pop();
+      this.memberPetitionVo.sendIdList.pop()
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     saveDate() {
       // 审批流程
 
-      this.memberPetitionVo.userIdList = this.memberPetitionVo.userIdList.map(
+      const userIdList = this.memberPetitionVo.userIdList.map(
         (item) => item.pkApprover
-      );
+      )
 
-      this.memberPetitionVo.sendIdList = this.memberPetitionVo.sendIdList.map(
+      const sendIdList = this.memberPetitionVo.sendIdList.map(
         (item) => item.pkSend
-      );
+      )
 
-      let url = "";
+      let url = ''
       if (this.czlx == 1) {
-        url = rechargeFill;
+        url = rechargeFill
       } else if (this.czlx == 2) {
-        url = rechargePlFill;
+        url = rechargePlFill
       }
-      this.memberPetitionVo.isSpecial = this.isSpecial;
+      this.memberPetitionVo.isSpecial = this.isSpecial
-      url(Object.assign(this.memberPetitionVo)).then((res) => {
+      url(Object.assign({}, this.memberPetitionVo, { userIdList, sendIdList })).then((res) => {
         if (res.code == 200) {
           this.$message({
             message: res.msg,
-            type: "success",
+            type: 'success'
-          });
+          })
           this.$router.push({
-            name: "RechargeDetail",
+            name: 'RechargeDetail'
-          });
+          })
         }
-      });
+      })
     },
     cancelCz() {
-      this.$router.go(-1);
+      this.$router.go(-1)
     },
     findQcDetail() {
       findQcDetail(this.$route.query.pkId).then((res) => {
-        this.qcList = res.data;
+        this.qcList = res.data
-      });
+      })
-    },
+    }
-  },
+  }
-};
+}
 </script>
 
 <style lang="scss" scoped>

src/views/settlementCenter/bonusCount/index.vue

@@ -20,23 +20,23 @@
       >
         <el-row>
           <!-- 一层 -->
-          <el-col :span="4" >
+          <el-col :span="4">
             <el-form-item :label="$t('MN_F_T_930')">
               <div style="display: flex">
                 <div>
                   <el-input v-model="select.period" clearable />
                 </div>
-<!--                <span style="margin: 0 10px">至</span>-->
+                <!--                <span style="margin: 0 10px">至</span>-->
-<!--                <div>-->
+                <!--                <div>-->
-<!--                  <el-input v-model="select.endPeriod" clearable />-->
+                <!--                  <el-input v-model="select.endPeriod" clearable />-->
-<!--                </div>-->
+                <!--                </div>-->
               </div>
             </el-form-item>
           </el-col>
 
           <el-collapse-transition>
             <div v-show="isActive">
-              <el-col :span="4" >
+              <el-col :span="4">
                 <el-form-item :label="$t('MN_F_T_931')">
                   <el-select
                     v-model="select.isRetry"
@@ -111,8 +111,8 @@
                       :range-separator="$t('w_0139')"
                       :start-placeholder="$t('CK_KS_4')"
                       :end-placeholder="$t('CK_KS_5')"
-                      @change="changeTime"
                       format="yyyy-MM-dd"
+                      @change="changeTime"
                     />
                   </el-form-item>
                 </el-col>
@@ -120,7 +120,7 @@
                   <el-button
                     class="my_search"
                     type="primary"
-                    @click="openFullScreen"
+                    @click="searchHandle"
                   > {{ $t('MN_T_2') }}</el-button>
                   <el-button
                     class="my_reset"
@@ -142,42 +142,47 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button
+            v-has-buttons="['bonusCountSettlement']"
             size="small"
             style="background-color: #48B2FD;"
             class="thebtn2"
+            :loading="calculateOperatorLoading"
             @click="balance"
-            v-has-buttons="['bonusCountSettlement']"
           >{{ $t('MN_F_T_934') }}</el-button>
           <el-button
+            v-has-buttons="['bonusCountPublish']"
             size="small"
             class="thebtn2"
+            :loading="calculateOperatorLoading"
             @click="publish"
-            v-has-buttons="['bonusCountPublish']"
           >{{ $t('MN_F_T_935') }}</el-button>
           <el-button
             size="small"
             class="thebtn2"
+            :loading="calculateOperatorLoading"
             @click="publish1"
           >{{ $t('MN_F_T_936') }}</el-button>
           <el-button
+            v-has-buttons="['bonusCountGrant']"
             size="small"
             style="background-color: #009B58"
             class="thebtn2"
-            v-has-buttons="['bonusCountGrant']"
+            :loading="calculateOperatorLoading"
             @click="grant"
           >{{ $t('MN_F_T_937') }}</el-button>
           <el-button
+            v-has-buttons="['bonusCountCash']"
             size="small"
             style="background-color: #48B2FD"
             class="thebtn2"
+            :loading="calculateOperatorLoading"
             @click="withdraw"
-            v-has-buttons="['bonusCountCash']"
           >{{ $t('MN_F_T_938') }}</el-button>
         </div>
         <div>
           <el-dropdown :hide-on-click="false">
             <span class="el-dropdown-link kuang">
-              {{$t('MN_F_T_939')}}<i class="el-icon-arrow-down el-icon--right" />
+              {{ $t('MN_F_T_939') }}<i class="el-icon-arrow-down el-icon--right" />
             </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
@@ -205,7 +210,7 @@
             :summary-method="getSummaries"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column type="selection"> </el-table-column>
+            <el-table-column type="selection" />
             <el-table-column
               align="center"
               prop="pkId"
@@ -275,15 +280,15 @@
               :label="$t('MN_F_T_945')+'(%)'"
               :formatter="stateFormat"
             />
-<!--            <el-table-column-->
+            <!--            <el-table-column-->
-<!--              v-for="item in menuList"-->
+            <!--              v-for="item in menuList"-->
-<!--              v-if="item.checked&&item.id != 0&&item.id < 5"-->
+            <!--              v-if="item.checked&&item.id != 0&&item.id < 5"-->
-<!--              :key="item.id"-->
+            <!--              :key="item.id"-->
-<!--              align="center"-->
+            <!--              align="center"-->
-<!--              width="130"-->
+            <!--              width="130"-->
-<!--              :prop="item.prop"-->
+            <!--              :prop="item.prop"-->
-<!--              :label="item.text"-->
+            <!--              :label="item.text"-->
-<!--            />-->
+            <!--            />-->
             <el-table-column
               align="center"
               prop="isSettleVal"
@@ -354,17 +359,17 @@
             <!--            </el-table-column>-->
           </el-table>
         </div>
-<!--        <div class="heji">-->
+        <!--        <div class="heji">-->
-<!--          <div-->
+        <!--          <div-->
-<!--            v-for="item in menuList"-->
+        <!--            v-for="item in menuList"-->
-<!--            v-if="item.checked&&item.id != 0&&item.id > 13"-->
+        <!--            v-if="item.checked&&item.id != 0&&item.id > 13"-->
-<!--            :key="item.id"-->
+        <!--            :key="item.id"-->
-<!--            class="dis"-->
+        <!--            class="dis"-->
-<!--          >-->
+        <!--          >-->
-<!--            <div>{{ item.text }}</div>-->
+        <!--            <div>{{ item.text }}</div>-->
-<!--            <div>{{ tableData[item.prop] }}</div>-->
+        <!--            <div>{{ tableData[item.prop] }}</div>-->
-<!--          </div>-->
+        <!--          </div>-->
-<!--        </div>-->
+        <!--        </div>-->
       </div>
     </div>
     <pagination
@@ -384,12 +389,12 @@ import * as api from '@/api/settle.js'
 import { classifyUpdate, classifySave } from '@/api/product'
 import * as log from '@/api/logistics'
 import { getcountryAllList } from '@/api/exchangerate'
-import {getDealerYesno, settleBonus, publishBonus, grantBonus, withdrawalBonus, noPublishBonus,} from '@/api/member'
+import { getDealerYesno, settleBonus, publishBonus, grantBonus, withdrawalBonus, noPublishBonus } from '@/api/member'
 import { listPeriod } from '@/api/bonus'
 import { Message } from 'element-ui'
-import {isLocal, isLocalSymbol, stateFormat} from "@/utils/numberToCurrency";
+import { isLocal, isLocalSymbol, stateFormat } from '@/utils/numberToCurrency'
-import {mapGetters} from "vuex";
+import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui';
+import { Loading } from 'element-ui'
 export default {
   name: 'Bzpz',
   components: {
@@ -398,9 +403,9 @@ export default {
   filters: {
     isAgree(val) {
       if (!val) {
-        return this.$t('ENU_POPUP_TYPE_1');
+        return this.$t('ENU_POPUP_TYPE_1')
       } else {
-        return this.$t('ENU_POPUP_TYPE_2');
+        return this.$t('ENU_POPUP_TYPE_2')
       }
     }
   },
@@ -421,18 +426,18 @@ export default {
       digList: [
         {
           value: 0,
-          label: this.$t('ENU_POPUP_TYPE_1'),
+          label: this.$t('ENU_POPUP_TYPE_1')
         },
         {
           value: 1,
-          label: this.$t('ENU_POPUP_TYPE_2'),
+          label: this.$t('ENU_POPUP_TYPE_2')
-        },
+        }
       ],
       menuList: [
         {
           id: 0,
           text: this.$t('MN_F_T_948'),
-          checked: true,
+          checked: true
         },
         {
           id: 1,
@@ -444,19 +449,19 @@ export default {
           id: 2,
           text: `${this.$t('MN_F_T_843')}(${isLocalSymbol()})`,
           checked: true,
-          prop: 'upgradeAmountDollar',
+          prop: 'upgradeAmountDollar'
         },
         {
           id: 3,
           text: `${this.$t('MN_F_T_854')}(${isLocalSymbol()})`,
           checked: true,
-          prop: 'repurchaseAmountDollar',
+          prop: 'repurchaseAmountDollar'
         },
         {
           id: 4,
           text: `${this.$t('MN_F_T_943')}(${isLocalSymbol()})`,
           checked: true,
-          prop: 'fansAmountDollar',
+          prop: 'fansAmountDollar'
         }
       ],
       creationTime: [],
@@ -495,10 +500,7 @@ export default {
       yieldStatus: [],
       countryList: [],
       orderTypeList: [],
-      button1Flag:false,
+      calculateOperatorLoading: false
-      button2Flag:false,
-      button3Flag:false,
-      button4Flag:false,
     }
   },
   mounted() {
@@ -529,6 +531,7 @@ export default {
       const verify = this.verifySelect()
       const time = this.$refs.multipleTable.selection[0].settleDate
       if (verify) {
+        this.calculateOperatorLoading = true
         settleBonus({ 'settleDate': time }).then((res) => {
           if (res.code == 200) {
             Message({
@@ -541,6 +544,8 @@ export default {
               type: 'error'
             })
           }
+        }).finally(() => {
+          this.calculateOperatorLoading = false
         })
       }
     },
@@ -549,6 +554,7 @@ export default {
       const verify = this.verifySelect()
       const time = this.$refs.multipleTable.selection[0].settleDate
       if (verify) {
+        this.calculateOperatorLoading = true
         noPublishBonus({ 'settleDate': time }).then((res) => {
           if (res.code == 200) {
             Message({
@@ -561,6 +567,8 @@ export default {
               type: 'error'
             })
           }
+        }).finally(() => {
+          this.calculateOperatorLoading = false
         })
       }
     },
@@ -569,6 +577,7 @@ export default {
       const verify = this.verifySelect()
       const time = this.$refs.multipleTable.selection[0].settleDate
       if (verify) {
+        this.calculateOperatorLoading = true
         publishBonus({ 'settleDate': time }).then((res) => {
           if (res.code == 200) {
             Message({
@@ -581,6 +590,8 @@ export default {
               type: 'error'
             })
           }
+        }).finally(() => {
+          this.calculateOperatorLoading = false
         })
       }
     },
@@ -589,6 +600,7 @@ export default {
       const verify = this.verifySelect()
       const time = this.$refs.multipleTable.selection[0].settleDate
       if (verify) {
+        this.calculateOperatorLoading = true
         grantBonus({ 'settleDate': time }).then((res) => {
           if (res.code == 200) {
             Message({
@@ -601,6 +613,8 @@ export default {
               type: 'error'
             })
           }
+        }).finally(() => {
+          this.calculateOperatorLoading = false
         })
       }
     },
@@ -609,6 +623,7 @@ export default {
       const verify = this.verifySelect()
       const time = this.$refs.multipleTable.selection[0].settleDate
       if (verify) {
+        this.calculateOperatorLoading = true
         withdrawalBonus({ 'settleDate': time }).then((res) => {
           if (res.code == 200) {
             Message({
@@ -621,6 +636,8 @@ export default {
               type: 'error'
             })
           }
+        }).finally(() => {
+          this.calculateOperatorLoading = false
         })
       }
     },
@@ -654,7 +671,7 @@ export default {
       })
     },
     changeTime(val) {
-      if(val){
+      if (val) {
         this.select.startDate = val[0]
         this.select.endDate = val[1]
       }
@@ -675,7 +692,7 @@ export default {
       const sums = []
       columns.forEach((column, index) => {
         if (index === 0) {
-          sums[index] = this.$t('MN_F_T_951') +'(￥)'
+          sums[index] = this.$t('MN_F_T_951') + '(￥)'
           return
         }
         if (index === 1) {
@@ -750,25 +767,25 @@ export default {
       })
     },
     getDataList() {
-      if(this.select.period){
+      if (this.select.period) {
-        this.select.period=parseInt(this.select.period)
+        this.select.period = parseInt(this.select.period)
       }
       if (this.creationTime == '' || this.creationTime == null) {
         this.select.startDate = ''
         this.select.endDate = ''
       }
       Number(this.select)
-      listPeriod(Object.assign({}, this.select),`?pageNum=${this.queryParams.pageNum}&pageSize=${this.queryParams.pageSize}`)
+      listPeriod(Object.assign({}, this.select), `?pageNum=${this.queryParams.pageNum}&pageSize=${this.queryParams.pageSize}`)
         .then((res) => {
           this.tableData.censusSummaryList = res.rows
           this.total = res.total
         })
     },
-    openFullScreen(){
+    searchHandle() {
       const loading = Loading.service({
         lock: true,
         text: 'Loading',
-        background: 'rgba(0, 0, 0, 0.7)',
+        background: 'rgba(0, 0, 0, 0.7)'
       })
       setTimeout(() => {
         loading.close()
@@ -779,7 +796,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
-      this.$confirm( this.$t('MN_F_T_407'), this.$t('MN_F_T_304'), {
+      this.$confirm(this.$t('MN_F_T_407'), this.$t('MN_F_T_304'), {
         confirmButtonText: this.$t('w_0035'),
         cancelButtonText: this.$t('ENU_P_TYPE0'),
         type: 'warning'

vue.config.js

@@ -30,13 +30,20 @@ module.exports = {
   lintOnSave: false,
   productionSourceMap: false,
   devServer: {
-    port: port,
+    port: 30188,
     open: true,
     overlay: {
       warnings: false,
       errors: true
     },
-    before: require('./mock/mock-server.js')
+    proxy: {
+      '/prod-api': {
+        target: 'http://192.168.0.86:8080',
+        changeOrigin: true,
+        pathRewrite: { '^/prod-api': '' }
+      }
+    }
+    // before: require('./mock/mock-server.js')
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that
@@ -52,7 +59,7 @@ module.exports = {
       'zhCN': 'zhCN',
       'zhTC': 'zhTC',
       'ruRU': 'ruRU',
-      'frFR': 'frFR',
+      'frFR': 'frFR'
     }
   },
   chainWebpack(config) {