1

unimall-admin/config/dep.env.js

@@ -1,6 +1,6 @@
 module.exports = {
-	NODE_ENV: '"production"',
-  ENV_CONFIG: '"dep"',
-  HOST: 'http://192.168.1.113:8091',
-  BASE_API: '"http://192.168.1.113/m.api"'
-}
+    NODE_ENV: '"production"',
+    ENV_CONFIG: '"dep"',
+    HOST: '"http://192.168.110.82:8091"',
+    BASE_API: '"http://192.168.110.82:8091/m.api"'
+}

unimall-admin/config/dev.env.js

@@ -1,12 +1,12 @@
 module.exports = {
-	NODE_ENV: '"development"',
-  ENV_CONFIG: '"dev"',
+    NODE_ENV: '"development"',
+    ENV_CONFIG: '"dev"',
 
-  HOST: '"http://192.168.1.113:8091"',
-  BASE_API: '"http://192.168.1.113:8091/m.api"'
-  // HOST: '"http://192.168.1.115:8080"',
-  // BASE_API: '"http://192.168.1.115:8080/m.api"'
-  // HOST: '"http://192.168.1.113:8080"',
-  
-  // BASE_API: '"http://192.168.1.113:8080/m.api"'
-}
+    HOST: '"http://192.168.110.82:8091"',
+    BASE_API: '"http://192.168.110.82:8091/m.api"'
+        // HOST: '"http://192.168.1.115:8080"',
+        // BASE_API: '"http://192.168.1.115:8080/m.api"'
+        // HOST: '"http://192.168.1.113:8080"',
+
+    // BASE_API: '"http://192.168.1.113:8080/m.api"'
+}

unimall-admin/config/index.js

@@ -5,84 +5,84 @@
 const path = require('path')
 
 module.exports = {
-  dev: {
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {},
+    dev: {
+        // Paths
+        assetsSubDirectory: 'static',
+        assetsPublicPath: '/',
+        proxyTable: {},
 
-    // Various Dev Server settings
+        // Various Dev Server settings
 
-    // can be overwritten by process.env.HOST
-    // if you want dev by ip, please set host: '0.0.0.0'
-    host: '192.168.1.116',
-    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: true,
-    errorOverlay: true,
-    notifyOnErrors: false,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+        // can be overwritten by process.env.HOST
+        // if you want dev by ip, please set host: '0.0.0.0'
+        host: '192.168.110.175',
+        port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+        autoOpenBrowser: true,
+        errorOverlay: true,
+        notifyOnErrors: false,
+        poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
 
-    // Use Eslint Loader?
-    // If true, your code will be linted during bundling and
-    // linting errors and warnings will be shown in the console.
-    useEslint: true,
-    // If true, eslint errors and warnings will also be shown in the error overlay
-    // in the browser.
-    showEslintErrorsInOverlay: false,
+        // Use Eslint Loader?
+        // If true, your code will be linted during bundling and
+        // linting errors and warnings will be shown in the console.
+        useEslint: true,
+        // If true, eslint errors and warnings will also be shown in the error overlay
+        // in the browser.
+        showEslintErrorsInOverlay: false,
 
-    /**
-     * Source Maps
-     */
+        /**
+         * Source Maps
+         */
 
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'cheap-source-map',
+        // https://webpack.js.org/configuration/devtool/#development
+        devtool: 'cheap-source-map',
 
-    // CSS Sourcemaps off by default because relative paths are "buggy"
-    // with this option, according to the CSS-Loader README
-    // (https://github.com/webpack/css-loader#sourcemaps)
-    // In our experience, they generally work as expected,
-    // just be aware of this issue when enabling this option.
-    cssSourceMap: false
-  },
+        // CSS Sourcemaps off by default because relative paths are "buggy"
+        // with this option, according to the CSS-Loader README
+        // (https://github.com/webpack/css-loader#sourcemaps)
+        // In our experience, they generally work as expected,
+        // just be aware of this issue when enabling this option.
+        cssSourceMap: false
+    },
 
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
+    build: {
+        // Template for index.html
+        index: path.resolve(__dirname, '../dist/index.html'),
 
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
+        // Paths
+        assetsRoot: path.resolve(__dirname, '../dist'),
+        assetsSubDirectory: 'static',
 
-    /**
-     * You can set by youself according to actual condition
-     * You will need to set this if you plan to deploy your site under a sub path,
-     * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
-     * then assetsPublicPath should be set to "/bar/".
-     * In most cases please use '/' !!!
-     */
-    assetsPublicPath: '/',
+        /**
+         * You can set by youself according to actual condition
+         * You will need to set this if you plan to deploy your site under a sub path,
+         * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
+         * then assetsPublicPath should be set to "/bar/".
+         * In most cases please use '/' !!!
+         */
+        assetsPublicPath: '/',
 
-    /**
-     * Source Maps
-     */
-    productionSourceMap: false,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: 'source-map',
+        /**
+         * Source Maps
+         */
+        productionSourceMap: false,
+        // https://webpack.js.org/configuration/devtool/#production
+        devtool: 'source-map',
 
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
+        // Gzip off by default as many popular static hosts such as
+        // Surge or Netlify already gzip all static assets for you.
+        // Before setting to `true`, make sure to:
+        // npm install --save-dev compression-webpack-plugin
+        productionGzip: false,
+        productionGzipExtensions: ['js', 'css'],
 
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build:prod --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report || false,
+        // Run the build command with an extra argument to
+        // View the bundle analyzer report after build finishes:
+        // `npm run build:prod --report`
+        // Set to `true` or `false` to always turn it on or off
+        bundleAnalyzerReport: process.env.npm_config_report || false,
 
-    // `npm run build:prod --generate_report`
-    generateAnalyzerReport: process.env.npm_config_generate_report || false
-  }
-}
+        // `npm run build:prod --generate_report`
+        generateAnalyzerReport: process.env.npm_config_generate_report || false
+    }
+}

unimall-admin/config/prod.env.js

@@ -1,11 +1,13 @@
 module.exports = {
-	NODE_ENV: '"production"',
-	ENV_CONFIG: '"prod"',
+    NODE_ENV: '"production"',
+    ENV_CONFIG: '"prod"',
     // HOST: '"https://www.zthymaoyi.com"',
-	  // BASE_API: '"https://www.zthymaoyi.com/m.api"'
-	// HOST: '"https://192.168.1.113.com"',
-	//   BASE_API: '"https://192.168.1.113/m.api"'
-    HOST: '"http://162.62.62.59:8091"',
-	BASE_API: '"http://162.62.62.59:8091/m.api"'
+    // BASE_API: '"https://www.zthymaoyi.com/m.api"'
+    // HOST: '"https://192.168.1.113.com"',
+    //   BASE_API: '"https://192.168.1.113/m.api"'
+    HOST: '"http://162.62.62.59:8089"',
+    BASE_API: '"http://162.62.62.59:8089/m.api"'
+        // HOST: '"http://162.62.62.59:8091"',
+        // BASE_API: '"http://162.62.62.59:8091/m.api"'
 
-}
+}

unimall-admin/src/views/collectionPayment/collectionPayment.vue

@@ -100,13 +100,7 @@
       show-summary
       @selection-change="handleSelectionChange">
       <el-table-column :selectable="selectInit" type="selection"/>
-      <el-table-column type="index" label="序号">
-        <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-          <span v-else>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-
+      <el-table-column align="center" label="编号" prop="payNo" />
       <el-table-column align="center" label="收款日期" prop="receiptPaymentDate">
         <template slot-scope="scope">
           {{ scope.row.receiptPaymentDate }}</template>
@@ -117,10 +111,10 @@
       <el-table-column align="center" label="金额（人民币）" prop="deductionRmb" />
       <el-table-column align="center" label="备注1" prop="remarks" />
       <el-table-column align="center" label="备注2" prop="remark" />
-      <el-table-column align="center" label="状态" prop="status">
+      <!-- <el-table-column align="center" label="状态" prop="status">
         <template slot-scope="scope">
           {{ scope.row.status == 1 ? '已作废' : '' }}</template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column align="center" label="操作人" prop="updatePeople" />
       <!-- <el-form-item label="操作人" prop="updatePeople">
                     <el-input v-model="dataForm.updatePeople" />
@@ -250,6 +244,7 @@ export default {
   components: { Pagination },
   data() {
     return {
+      currentPage: 1,
       khList: [],
       khList1: [],
       typeList: [{
@@ -451,11 +446,10 @@ export default {
               })
               return
             } else {
-              _this.excelFreightspace.push(obj)
               _this.isAllowExport = true
             }
             for (let i = 0; i < _this.khList.length; i++) {
-              _this.khList1.push(_this.khList[i].receivingWithdrawingPeople)
+              _this.khList1.push(_this.khList[i].customer)
             }
             if (!_this.khList1.includes(obj.receivingWithdrawingPeople)) {
               _this.isAllowExport = false
@@ -466,9 +460,9 @@ export default {
               })
               return
             } else {
-              _this.excelFreightspace.push(obj)
               _this.isAllowExport = true
             }
+            _this.excelFreightspace.push(obj)
           })
           if (_this.excelFreightspace && _this.isAllowExport) {
             importWord(_this.excelFreightspace).then((response) => {

unimall-admin/src/views/collectionPayment/collectionPayment1.vue

@@ -222,6 +222,7 @@ export default {
   components: { Pagination },
   data() {
     return {
+      currentPage: 1,
       isAllowExport: true,
       countryList: [],
       modification: [],
@@ -273,6 +274,7 @@ export default {
   },
   created() {
     this.getList()
+    this.currentPage = 1
   },
   methods: {
     handleSizeChange(val) {

unimall-admin/src/views/customerBilling/customerBillingInfo.vue

@@ -364,10 +364,10 @@ export default {
               })
               return
             } else {
-              _this.excelFreightspace.push(obj)
+              // _this.excelFreightspace.push(obj)
               _this.isAllowExport = true
             }
-            // _this.excelFreightspace.push(obj)
+            _this.excelFreightspace.push(obj)
           })
           if (_this.excelFreightspace && _this.isAllowExport) {
             importWord(_this.excelFreightspace).then((response) => {
@@ -432,9 +432,7 @@ export default {
           sums[index] = '合计'
           return
         } else if (
-          index == 6 ||
-          index == 7 ||
-          index == 8
+          index == 6
         ) {
           const values = data.map(item => Number(item[column.property]))
           if (!values.every(value => isNaN(value))) {
@@ -454,33 +452,11 @@ export default {
           // sums[index] = "--";
         }
       })
-
-      return sums
-    },
-    async exportlist() {
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要导出的条目！')
-      } else {
-        console.log('导出数据', this.modification)
-        const _data = {
-          customerBillingInfoDTOS: this.modification
-        }
-        const {
-          data
-        } = await exportXlsx(_data).then((response) => {
-          this.download(response.data.data)
-          //   downloadFile({
-          //     res: data,
-          //     fileName: `${
-          //     this.date.year + (this.date.month ? `-${this.date.month}` : '')
-          //     }付款信息`,
-          //     type: 'xls',
-          //     })
-          if (response.status == '200') {
-
-          }
-        })
+      debugger
+      if (sums.length>0) {
+        sums[6] = Number(sums[6]).toFixed(2)
       }
+      return sums
     },
     getList() {
       this.listLoading = true

unimall-admin/src/views/customerInfo/customerInfo.vue

@@ -62,7 +62,7 @@
         <el-form-item label="客户" prop="customer">
           <el-input v-model="dataForm.customer" />
         </el-form-item>
-        <el-form-item label="应付金额" prop="amountPayable">
+        <!-- <el-form-item label="应付金额" prop="amountPayable">
           <el-input v-model="dataForm.amountPayable" :disabled="textMap[dialogStatus]=='编辑'"/>
         </el-form-item>
         <el-form-item label="已付金额" prop="unpaidAmount">
@@ -70,7 +70,7 @@
         </el-form-item>
         <el-form-item label="余额" prop="syAmount">
           <el-input v-model="dataForm.syAmount" :disabled="textMap[dialogStatus]=='编辑'"/>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="状态" prop="status">
           <el-input v-model="dataForm.status" />
         </el-form-item> -->