Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

.env.dev

@@ -5,7 +5,7 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = 捷道管理系统
 
 # 捷道管理系统/开发环境
-VUE_APP_BASE_API = 'http://jd.admtest.jdshangmen.com'
+VUE_APP_BASE_API = 'https://jd.admtest.jdshangmen.com'
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

.env.development

@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 捷道管理系统
 
 # 捷道管理系统/开发环境
-VUE_APP_BASE_API = 'http://jd.admtest.jdshangmen.com'
+VUE_APP_BASE_API = 'https://jd.admtest.jdshangmen.com'
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

src/views/ecw/customerComplaint/index.vue

@@ -85,8 +85,9 @@
       </el-table-column>
       <el-table-column :label="$t('赔付金额')" align="center" prop="handleAt" width="180">
         <template slot-scope="scope">
-          {{scope.row.indemnity || '0.00'}}
+          {{ scope.row.status === 3 ?  scope.row.indemnity  : '/'}}
           <dict-tag
+            v-if="scope.row.status === 3"
             :value="scope.row.currencyUnit"
             :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-tag>
         </template>

src/views/ecw/customerConfirm/index.vue

@@ -105,6 +105,11 @@
                      v-hasPermi="['ecw:customer:update']">{{$t('确认接收')}}</el-button>
           <el-button size="mini" type="text"  @click="handOver(scope.row)"
                      v-hasPermi="['ecw:customer:update']">{{$t('移交')}}</el-button>
+           <router-link style="margin: 0 10px;" to="/offer/create">
+             <el-button  size="mini" type="text">
+               {{$t('报价')}}
+             </el-button>
+           </router-link>
           <el-button size="mini" type="text"   @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:customer:update']">{{$t('完善')}}</el-button>
         </template>

src/views/ecw/financial/receiptDetail.vue

@@ -10,7 +10,7 @@
         <el-descriptions-item :label="$t('客户')">{{ form.customerName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('部门')">{{ form.departmentName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('手续费（RMB）')">{{ form.feeRate }}</el-descriptions-item>
+        <!-- <el-descriptions-item :label="$t('手续费（RMB）')">{{ form.feeRate }}</el-descriptions-item> -->
         <el-descriptions-item :label="$t('备注')">{{ form.remark }}</el-descriptions-item>
       </el-descriptions>
     </el-card>
@@ -406,6 +406,7 @@
 <script>
 import { getBankAccountPage } from "@/api/ecw/bankAccount";
 import { getToken } from "@/utils/auth";
+import { listSimpleDepts } from "@/api/system/dept";
 import { getCustomer } from '@/api/ecw/customer'
 import {
   getReceiptInfoByIds,
@@ -442,6 +443,8 @@ export default {
       },
       addForm: {},
       detailed: [],
+      deptData: [],
+      deptArr: [],
       dialogTitle: this.$t('添加银行实收明细'),
       saveBtnText: this.$t('添加'),
       isView: false,
@@ -523,6 +526,23 @@ export default {
   async created() {
     // 获取汇率
     await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
+     await listSimpleDepts().then((res) => {
+      res.data.forEach((item) => {
+        if (item.parentId == 0) {
+          this.deptArr.push(item);
+        } else {
+          this.deptData.push(item);
+        }
+      });
+
+      this.deptData.forEach((value) => {
+        var dept = this.deptArr.filter((itt) => itt.id == value.parentId);
+        if (dept.length > 0) {
+          value.name = dept[0].name + " | " + value.name;
+        }
+      });
+      // console.log(this.deptData)
+    });
     await getBankAccountPage(this.params).then((res) => (this.bankData = res.data.list));
     if (this.$route.query.id) {
       this.id = this.$route.query.id;
@@ -531,6 +551,11 @@ export default {
         getCustomer(this.form.customerId).then(res => {
           this.form.customerName = res?.data?.name
         })
+        var dept = this.deptData.filter((itt) => itt.id == res.data.departmentId);
+        // console.log(dept)
+        if(dept.length>0){
+          this.form.departmentName = dept[0].name
+        }
       })
       await getInvoicingItem({ id: this.id }).then(res => {
         this.list = [...res.data]

src/views/ecw/warehouseAreaPosition/index.vue

@@ -315,7 +315,7 @@ computed: {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -384,8 +384,8 @@ computed: {
     handleExport() {
       // 处理查询参数
       let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
+      params.page = undefined;
+      params.rows = undefined;
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm(this.$t('是否确认导出所有储位数据项?')).then(() => {