Merge remote-tracking branch 'origin/dev1.6' into dev1.6

.env.development

@@ -6,7 +6,7 @@ VUE_APP_TITLE = 捷道管理系统-测试站
 
 # 捷道管理系统/开发环境
 
-VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
+VUE_APP_BASE_API = 'https://api.sit.jdshangmen.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/components/QuickCreateCustomer/index.vue

@@ -32,14 +32,14 @@
                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('创建时间')" prop="createTime">
+      <!-- <el-form-item :label="$t('创建时间')" prop="createTime">
         <el-date-picker
           v-model="form.createTime"
           type="datetime"
           value-format="timestamp"
           :placeholder="$t('选择创建时间')">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('客户经理')" prop="customerService">
         <el-select v-model="form.customerService" :placeholder="$t('请选择客户经理')">
           <el-option v-for="item in serviceUserList"

src/views/ecw/deptTarget/allAchievement.vue

@@ -41,8 +41,8 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button type="primary" icon="el-icon-search" @click="resetQuery">{{$t('重置')}}</el-button>
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportDetail" :loading="exportLoading">{{ $t('导出明细') }}</el-button>
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportStatistics" :loading="exportLoading">{{ $t('导出统计') }}</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportDetail" :loading="exportLoading" v-hasPermi="['ecw:achievement:export']">{{ $t('导出明细') }}</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportStatistics" :loading="exportLoading" v-hasPermi="['ecw:achievement:export']">{{ $t('导出统计') }}</el-button>
 <!--        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                   >{{$t('导出')}}</el-button> -->
       </el-form-item>

src/views/ecw/financial/creatCollection.vue

@@ -94,6 +94,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
+            v-hasPermi="['ecw:voucher:create:add']"
             style="padding: 10px; margin-bottom: 10px"
             >{{ $t('添加未收客户款项') }}</el-button
           >
@@ -153,8 +154,8 @@
           </el-table-column>
           <el-table-column :label="$t('操作')" align="center">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.type !== 'total'" type="text" @click="addDiscount(scope.row, scope.$index)">{{ scope.row.discountTotal ? $t('修改优惠') : $t('新增优惠') }}</el-button>
-              <el-button v-if="scope.row.type !== 'total'" type="text" @click="deleteListRow(scope.$index)">{{ $t('删除') }}</el-button>
+              <el-button v-if="scope.row.type !== 'total'" type="text" v-hasPermi="['ecw:voucher:create:editdiscount']" @click="addDiscount(scope.row, scope.$index)">{{ scope.row.discountTotal ? $t('修改优惠') : $t('新增优惠') }}</el-button>
+              <el-button v-if="scope.row.type !== 'total'" type="text" v-hasPermi="['ecw:voucher:create:deldiscount']" @click="deleteListRow(scope.$index)">{{ $t('删除') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -412,9 +413,9 @@
     <work-flow  xmlkey="merge_order" v-model="form.copyUserList"></work-flow>
 
     <div slot="footer" style="margin: 20px 0">
-      <el-button type="primary" @click="submitForm(0)">{{$t('提交申请')}}</el-button>
-      <el-button v-if="id==0||form.state==0" type="primary" :loading="saveBtnLoading" @click="submitForm(1)">{{ $t('保存草稿') }}</el-button>
-      <el-button v-if="orderData.inWarehouseState==207" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderApprovalBackVO.applyingFormId)">{{$t('审核中')}}</el-button>
+      <el-button type="primary" @click="submitForm(0)" v-hasPermi="['ecw:voucher:create:sumbit']">{{$t('提交申请')}}</el-button>
+      <el-button v-if="id==0||form.state==0" type="primary" :loading="saveBtnLoading" v-hasPermi="['ecw:voucher:create:save']" @click="submitForm(1)">{{ $t('保存草稿') }}</el-button>
+      <el-button v-if="orderData.inWarehouseState==207" type="primary" v-hasPermi="['ecw:voucher:create:see']" @click="$router.push(`/bpm/process-instance/detail?id=`+orderApprovalBackVO.applyingFormId)">{{$t('审核中')}}</el-button>
       <!-- <el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button> -->
       <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
       <!-- <el-button type="primary" :loading="saveBtnLoading" @click="submitForm(0)">{{ id&&form.state!=0 ? $t('修改') : $t('新增收款单') }}</el-button> -->
@@ -1185,6 +1186,9 @@ export default {
           this.opnotice = true
         }else{
           this.opnotice = false
+          this.$set(this.discountForm, 'discountTotal', '')
+          this.$set(this.discountForm, 'discountRemark', '')
+          this.$set(this.discountForm, 'author', '')
         }
       })
     },

src/views/ecw/financial/receiptDetail.vue

@@ -266,7 +266,7 @@
             <el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)" v-hasPermi="['ecw:payment:detail:bankEdit']">{{ $t('编辑') }}</el-button>
             <el-button v-if="scope.row.status == 2" type="text" @click="cancelClick(scope.$index,1)" v-hasPermi="['ecw:payment:detail:cancelDetailApproval']">{{ $t('取消审核') }}</el-button>
              <el-button v-if="scope.row.status == 3" type="text" @click="cancelClick(scope.$index,2)" v-hasPermi="['ecw:payment:detail:cancelWriteOffNo']">{{ $t('取消反核销审核') }}</el-button>
-            <el-button v-if="scope.row.status == 3 || scope.row.status == 2" type="text"  @click="$router.push(`/bpm/process-instance/detail?id=`+scope.row.bmpId)" v-hasPermi="['ecw:payment:detail:writeOff']">{{ $t('审核详情') }}</el-button>
+            <el-button v-if="scope.row.status == 3 || scope.row.status == 2" type="text"  @click="$router.push(`/bpm/process-instance/detail?id=`+scope.row.bmpId)" v-hasPermi="['ecw:payment:detail:approval']">{{ $t('审核详情') }}</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/ecw/supplier/detail.vue

@@ -288,7 +288,7 @@
             <el-input v-model="formData.externalVO.goodName" :placeholder="$t('请输入品名')" show-word-limit clearable readonly></el-input>
           </el-form-item>
           <el-form-item :label="$t('清关国家')" prop="clearanceFileId">
-            <el-select v-model="formData.clearanceFileId" @change="changeFile" disabled>
+            <el-select v-model="formData.externalVO.clearanceFileId" @change="changeFile" disabled>
               <el-option v-for="(item) in fileList" :value="item.id" :label="getCountry(item.country,item.district)" :key="item.id" />
             </el-select>
           </el-form-item>
@@ -347,6 +347,7 @@ import Selector from '@/components/Selector'
 import {validatePwd} from '@/api/ecw/busiPwd'
 import SuppliersSelector from '@/components/SuppliersSelector'
 import { getDockPage } from "@/api/ecw/dock";
+import { getListTree } from "@/api/ecw/region";
 export default {
   components: {upload,  AreaSelector, Selector, SuppliersSelector},
   props: [],
@@ -457,6 +458,9 @@ export default {
       getDockPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
         this.allDocks = res.data.list;
       });
+      getListTree({treeType: 1}).then(response => {
+        this.treeList = response.data
+      })
       
       this.getFile()
 
@@ -570,8 +574,11 @@ export default {
     },
     getCountry(countryId, districtId) {
       let country = this.treeList.find(item=>item.id == countryId)
-      let district = country.children.find(item=>item.id == districtId)
-      return this.$l(country, 'title')+' '+this.$l(district, 'title')
+      if(country){
+        let district = country.children.find(item=>item.id == districtId)
+        return this.$l(country, 'title')+' '+this.$l(district, 'title')
+      }
+      return ''
     },
     delContact(index){
       this.$confirm(this.$t('确定删除此联系人么？')).then(() => {