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

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/commission-Payment.vue

@@ -63,8 +63,8 @@
           </el-col>
           <el-col :span="4">
             <el-form-item>
-              <el-button type="primary" @click="getList">{{$t('查找')}}</el-button>
-              <el-button type="primary" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:0}})"  v-has-permi="['ecw:commission-Payment:add']" >{{$t('新增请款单')}}</el-button>
+              <el-button size="mini" type="primary" @click="getList">{{$t('查找')}}</el-button>
+              <el-button type="success" size="mini" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:0}})"  v-has-permi="['ecw:commission-Payment:add']" >{{$t('新增请款单')}}</el-button>
             </el-form-item>
           </el-col>
         </el-row>

src/views/ecw/financial/commission-payable.vue

@@ -79,8 +79,8 @@
         </el-col>
         <el-col :span="6">
           <el-form-item>
-            <el-button type="primary" @click="getList">{{$t('查找')}}</el-button>
-            <el-button v-has-permi="['ecw:commission-payable:add']" type="primary" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:0}})" >{{$t('新增请款单')}}</el-button>
+            <el-button size="mini" type="primary" @click="getList">{{$t('查找')}}</el-button>
+            <el-button size="mini" v-has-permi="['ecw:commission-payable:add']" type="success" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:0}})" >{{$t('新增请款单')}}</el-button>
           </el-form-item>
         </el-col>
       </el-row>

src/views/ecw/financial/paymentVoucher.vue

@@ -97,6 +97,13 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
+            <el-button
+              style="margin-left: 10px"
+              type="success"
+              v-hasPermi="['ecw:paymentVoucher:create']"
+              @click="handleAdd(0)"
+            >{{ $t('新增请款单') }}</el-button
+            >
           </el-form-item>
         </el-row>
       </el-form>
@@ -346,7 +353,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(id) {
-      return this.$router.push("creatPayment?id=" + id);
+      return this.$router.push("creatPayment?payableId=" + id);
     },
     examineClick(id) {
       return this.$router.push("paymentExamine?id=" + id);