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

src/api/system/dept.js

@@ -9,6 +9,15 @@ export function listDept(query) {
   })
 }
 
+// 查询当前登陆人的所属部门列表
+export function myListDept(query) {
+  return request({
+    url: '/system/dept/myListDept',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询部门列表（排除节点）
 export function listDeptExcludeChild(deptId) {
   return request({

src/i18n/languages/en_US.json

@@ -1132,7 +1132,6 @@
     "会计": "Accounting",
     "出纳": "Cashier",
     "经手人": "Handler",
-    "确定打印": "OK to print",
     "收款日期": "Payment Date",
     "应收合计": "Total Receivable",
     "收款金额": "Receipt Amount",
@@ -3834,5 +3833,6 @@
     "是否确认删除渠道管理编号为{channelId}的数据项?": "Are you sure to delete the data item with channel management number {channelId}?",
     "流程详情":"Flow details",
     "收款单核销审核":"The payment voucher verification review",
-    "系统提示": "System prompt"
+    "系统提示": "System prompt",
+    "合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG": "Total：{totalNum}Box，{totalVolume}m³(Test) {totalChargeVolume}m³(Weight) {totalWeight}KG"
 }

src/views/ecw/box/query.vue

@@ -140,7 +140,7 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center">
                 <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;" v-hasPermi="['ecw:box-cost:delete']">{{$t('编辑')}}</el-button>
+                  <el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;" v-hasPermi="['ecw:box-cost:update']">{{$t('编辑')}}</el-button>
                   <el-popconfirm :title="$t('确定是否删除')" @confirm="deleteCostClick(scope.row)">
                     <el-button type="danger" size="small" slot="reference" v-hasPermi="['ecw:box-cost:delete']">{{$t('删除')}}</el-button>
                   </el-popconfirm>

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -27,14 +27,14 @@
     </el-form>
 
     <!-- 操作工具栏 -->
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
-<!--                   v-hasPermi="['ecw:dept-target:create']">{{$t('目标设置')}}-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['ecw:dept-target:create']">{{$t('目标设置')}}
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
@@ -149,7 +149,7 @@
         getPersonTargetPage,
         getMyDeptTargetPage
     } from "@/api/ecw/deptTarget";
-    import {listDept, listSimpleDepts} from "@/api/system/dept";
+    import {myListDept, listSimpleDepts} from "@/api/system/dept";
     import {getChannelList} from '@/api/ecw/channel';
     import dayjs from "dayjs";
 import { parseTime } from '@/utils/ruoyi';
@@ -271,7 +271,7 @@ import { parseTime } from '@/utils/ruoyi';
           /** 查询部门列表 */
           getDeptList(){
             this.loading = true;
-            listDept(this.queryParams).then(response => {
+            myListDept(this.queryParams).then(response => {
               this.deptList = this.handleTree(response.data, "id");
               console.log("this.deptList:"+JSON.stringify(this.deptList));
               this.deptList.forEach((item) => {

src/views/ecw/offer/detail.vue

@@ -781,13 +781,13 @@
       /** 删除按钮操作 */
       handleDelete() {
         const offerId = this.offerId;
-        this.$modal.confirm(this.$t('是否确认删除报价单管理编号为')+'"' + offerId + '"'+this.$t('的数据项')+'?').then(function() {
+        this.$confirm(this.$t('是否确认删除报价单管理编号为')+'"' + offerId + '"'+this.$t('的数据项')+'?').then(function() {
             return deleteOffer(offerId);
           }).then(() => {
             this.$router.push({
               path: "/offer/result"
             });
-            this.$modal.msgSuccess(this.$t("删除成功"));
+            this.$message.success(this.$t("删除成功"));
           }).catch(() => {});
       },
     }

src/views/ecw/offer/index.vue

@@ -258,7 +258,7 @@ export default {
       params.pageNo = undefined;
       params.pageSize = undefined;
       // 执行导出
-      this.$modal.confirm(this.$t('是否确认导出所有报价单管理数据项?')).then(() => {
+      this.$confirm(this.$t('是否确认导出所有报价单管理数据项?')).then(() => {
           this.exportLoading = true;
           if(this.dept){
             return exportDeptOfferExcel(params)
@@ -269,13 +269,13 @@ export default {
         }).catch(() => {});
     },
     cancel(id){
-      this.doAction('确定要取消此报价单么？', cancel, id);
+      this.doAction(this.$t('确定要取消此报价单么？'), cancel, id);
     },
     recovery(id){
-      this.doAction('确定要恢复此报价单么？', recovery, id);
+      this.doAction(this.$t('确定要恢复此报价单么？'), recovery, id);
     },
     deleteOffer(id){
-      this.doAction('确定要删除此报价单么？', deleteOffer, id);
+      this.doAction(this.$t('确定要删除此报价单么？'), deleteOffer, id);
     },
     doAction(tips, action, id){
       this.$confirm(tips).then(res => {

src/views/ecw/order/index.vue

@@ -128,26 +128,26 @@
           :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button> -->
         <el-dropdown v-hasPermi="isAll ? ['ecw:order:export','ecw:order:export:other']:[exportPermiString]">
           <el-button type="primary" :loading="exportLoading" size="mini">
-            导出 <i class="el-icon-arrow-down el-icon--right"></i>
+            {{$t('导出')}} <i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item>
-            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item>
+            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">{{$t('导出勾选')}}</el-dropdown-item>
+            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">{{$t('导出搜索')}}</el-dropdown-item>
             <template v-if="isAll">
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">异常单统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">重货单统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">退仓单统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">预付运费统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">{{$t('异常单统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">{{$t('重货单统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">{{$t('退仓单统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">{{$t('售后赔偿金额统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">{{$t('报关数据统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">{{$t('客户出货量统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">{{$t('预付运费统计')}}</el-dropdown-item>
             </template>
           </el-dropdown-menu>
         </el-dropdown>
       </el-col>
       <el-col :span="15" v-if="statistics">
         <!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
-        合计：{{statistics.totalNum}}箱，{{statistics.totalVolume}}m³(测) {{statistics.totalChargeVolume}}m³(重) {{statistics.totalWeight}}KG
+        {{$t('合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG', statistics)}}
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -366,7 +366,7 @@
                   <!-- 退仓 -->
                   <template v-if="
                       (
-                        include(scope.row.inWarehouseState, [202, 210, 211, 213, 214, 215, 216]) &&
+                        include(scope.row.inWarehouseState, [202, 210, 211, 214, 215, 216]) &&
                         exclude(scope.row.abnormalState, [1])
                       ) ||
                       include(scope.row.status, [16])

src/views/ecw/supplier/detail.vue

@@ -92,6 +92,46 @@
           <dict-selector v-model="formData.priceAdvantage" type="price_advantage" disabled />
         </el-form-item>
       </div>
+      <el-card class="mt-10" v-if="formData.areaType==0">
+        <div class="card-header" slot="header">
+          <div class="title">{{$t('优质条件')}}</div>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['1'])">
+          <el-form-item :label="$t('船公司')" prop="shipCompany" label-width="250">
+            <suppliers-selector v-model="formData.resourceVO.shipCompany" company-type="9" disabled />
+          </el-form-item>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['1','2','4','5','7'])">
+          <el-form-item :label="$t('港口')" prop="ports" label-width="250">
+            <el-select v-model="formData.resourceVO.ports" filterable multiple clearable disabled>
+                <el-option v-for="(item) in seaPort" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('港口优势条件')" prop="portConditions" label-width="250">
+            <dict-selector v-model="formData.resourceVO.portConditions" type="port_conditions" />
+          </el-form-item>
+          <el-button style="margin-left: 30px;" type="text" v-hasPermi="['ecw:dock:create']" @click="portVisible=true">{{$t('新增港口')}}</el-button>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['10'])">
+          <el-form-item :label="$t('航空公司')" prop="airCompany" label-width="250">
+            <suppliers-selector v-model="formData.resourceVO.airCompany" company-type="10" disabled />
+          </el-form-item>
+          <el-form-item :label="$t('航空公司优势条件')" prop="airConditions" label-width="250">
+            <dict-selector v-model="formData.resourceVO.airConditions" type="port_conditions" disabled />
+          </el-form-item>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['3'])">
+          <el-form-item :label="$t('出证速度')" prop="certificateSpeed" label-width="250">
+            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="0" disabled>{{$t('快')}}</el-radio>
+            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="1" disabled>{{$t('慢')}}</el-radio>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item :label="$t('合作不良记录登记')" prop="badCooperationRecord" label-width="250">
+            <el-input v-model="formData.resourceVO.badCooperationRecord" :placeholder="$t('请输入合作不良记录登记')" show-word-limit clearable readonly></el-input>
+          </el-form-item>
+        </div>
+      </el-card>
       <div v-if="formData.areaType==0">
        <el-card class="mt-10">
         <div class="card-header" slot="header">
@@ -147,46 +187,7 @@
         </el-table>
       </el-card>
 
-      <el-card class="mt-10">
-        <div class="card-header" slot="header">
-          <div class="title">{{$t('优质条件')}}</div>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['1'])">
-          <el-form-item :label="$t('船公司')" prop="shipCompany" label-width="250">
-            <suppliers-selector v-model="formData.resourceVO.shipCompany" company-type="9" disabled />
-          </el-form-item>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['1','2','4','5','7'])">
-          <el-form-item :label="$t('港口')" prop="ports" label-width="250">
-            <el-select v-model="formData.resourceVO.ports" filterable multiple clearable disabled>
-                <el-option v-for="(item) in seaPort" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('港口优势条件')" prop="portConditions" label-width="250">
-            <dict-selector v-model="formData.resourceVO.portConditions" type="port_conditions" />
-          </el-form-item>
-          <el-button style="margin-left: 30px;" type="text" v-hasPermi="['ecw:dock:create']" @click="portVisible=true">{{$t('新增港口')}}</el-button>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['10'])">
-          <el-form-item :label="$t('航空公司')" prop="airCompany" label-width="250">
-            <suppliers-selector v-model="formData.resourceVO.airCompany" company-type="10" disabled />
-          </el-form-item>
-          <el-form-item :label="$t('航空公司优势条件')" prop="airConditions" label-width="250">
-            <dict-selector v-model="formData.resourceVO.airConditions" type="port_conditions" disabled />
-          </el-form-item>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['3'])">
-          <el-form-item :label="$t('出证速度')" prop="certificateSpeed" label-width="250">
-            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="0" disabled>{{$t('快')}}</el-radio>
-            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="1" disabled>{{$t('慢')}}</el-radio>
-          </el-form-item>
-        </div>
-        <div>
-          <el-form-item :label="$t('合作不良记录登记')" prop="badCooperationRecord" label-width="250">
-            <el-input v-model="formData.resourceVO.badCooperationRecord" :placeholder="$t('请输入合作不良记录登记')" show-word-limit clearable readonly></el-input>
-          </el-form-item>
-        </div>
-      </el-card>
+      
       </div>
 
       <div v-if="formData.areaType==1">

src/views/ecw/supplier/edit.vue

@@ -108,6 +108,46 @@
           <dict-selector v-model="formData.priceAdvantage" type="price_advantage" />
         </el-form-item>
       </div>
+      <el-card class="mt-10" v-if="formData.areaType==0">
+        <div class="card-header" slot="header">
+          <div class="title">{{$t('优质条件')}}</div>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['1'])">
+          <el-form-item :label="$t('船公司')" prop="shipCompany" label-width="250">
+            <suppliers-selector v-model="formData.resourceVO.shipCompany" company-type="9" :disabled="false" />
+          </el-form-item>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['1','2','4','5','7'])">
+          <el-form-item :label="$t('港口')" prop="ports" label-width="250">
+            <el-select v-model="formData.resourceVO.ports" filterable multiple clearable>
+                <el-option v-for="(item) in seaPort" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('港口优势条件')" prop="portConditions" label-width="250">
+            <dict-selector v-model="formData.resourceVO.portConditions" type="port_conditions" />
+          </el-form-item>
+          <el-button style="margin-left: 30px;" type="text" v-hasPermi="['ecw:dock:create']" @click="portVisible=true">{{$t('新增港口')}}</el-button>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['10'])">
+          <el-form-item :label="$t('航空公司')" prop="airCompany" label-width="250">
+            <suppliers-selector v-model="formData.resourceVO.airCompany" company-type="10" :disabled="false" />
+          </el-form-item>
+          <el-form-item :label="$t('航空公司优势条件')" prop="airConditions" label-width="250">
+            <dict-selector v-model="formData.resourceVO.airConditions" type="port_conditions" />
+          </el-form-item>
+        </div>
+        <div v-if="typeBool(formData.companyTypeArr,['3'])">
+          <el-form-item :label="$t('出证速度')" prop="certificateSpeed" label-width="250">
+            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="0">{{$t('快')}}</el-radio>
+            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="1">{{$t('慢')}}</el-radio>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item :label="$t('合作不良记录登记')" prop="badCooperationRecord" label-width="250">
+            <el-input v-model="formData.resourceVO.badCooperationRecord" :placeholder="$t('请输入合作不良记录登记')" show-word-limit clearable></el-input>
+          </el-form-item>
+        </div>
+      </el-card>
       <div v-if="formData.areaType==0">
        <el-card class="mt-10">
         <div class="card-header" slot="header">
@@ -257,46 +297,7 @@
         </el-table>
       </el-card>
 
-      <el-card class="mt-10">
-        <div class="card-header" slot="header">
-          <div class="title">{{$t('优质条件')}}</div>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['1'])">
-          <el-form-item :label="$t('船公司')" prop="shipCompany" label-width="250">
-            <suppliers-selector v-model="formData.resourceVO.shipCompany" company-type="9" :disabled="false" />
-          </el-form-item>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['1','2','4','5','7'])">
-          <el-form-item :label="$t('港口')" prop="ports" label-width="250">
-            <el-select v-model="formData.resourceVO.ports" filterable multiple clearable>
-                <el-option v-for="(item) in seaPort" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('港口优势条件')" prop="portConditions" label-width="250">
-            <dict-selector v-model="formData.resourceVO.portConditions" type="port_conditions" />
-          </el-form-item>
-          <el-button style="margin-left: 30px;" type="text" v-hasPermi="['ecw:dock:create']" @click="portVisible=true">{{$t('新增港口')}}</el-button>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['10'])">
-          <el-form-item :label="$t('航空公司')" prop="airCompany" label-width="250">
-            <suppliers-selector v-model="formData.resourceVO.airCompany" company-type="10" :disabled="false" />
-          </el-form-item>
-          <el-form-item :label="$t('航空公司优势条件')" prop="airConditions" label-width="250">
-            <dict-selector v-model="formData.resourceVO.airConditions" type="port_conditions" />
-          </el-form-item>
-        </div>
-        <div v-if="typeBool(formData.companyTypeArr,['3'])">
-          <el-form-item :label="$t('出证速度')" prop="certificateSpeed" label-width="250">
-            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="0">{{$t('快')}}</el-radio>
-            <el-radio v-model="formData.resourceVO.certificateSpeed" :label="1">{{$t('慢')}}</el-radio>
-          </el-form-item>
-        </div>
-        <div>
-          <el-form-item :label="$t('合作不良记录登记')" prop="badCooperationRecord" label-width="250">
-            <el-input v-model="formData.resourceVO.badCooperationRecord" :placeholder="$t('请输入合作不良记录登记')" show-word-limit clearable></el-input>
-          </el-form-item>
-        </div>
-      </el-card>
+      
 
       <el-card class="mt-10" v-if="false">
         <div class="card-header" slot="header">