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

src/api/ecw/financial.js

@@ -395,11 +395,11 @@ export function paymentVerificationCancel(data) {
   })
 }
 // 取消付款单反核销
-export function paymentCancelFinancePaymentWriteOffNo(params){
+export function paymentCancelFinancePaymentWriteOffNo(data){
   return request({
     url:'ecw/payment/cancelFinancePaymentWriteOffNo',
-    method:'get',
-    params
+    method:'post',
+    data
   })
 }
 

src/views/ecw/customer/customerLog.vue

@@ -8,6 +8,11 @@
        <el-descriptions-item label="客户编号"><el-input v-model="queryForm.number"></el-input></el-descriptions-item>
        <el-descriptions-item label="新客户经理"><el-input v-model="queryForm.newCustomerService"></el-input></el-descriptions-item>
        <el-descriptions-item label="客户名称"><el-input v-model="queryForm.name"></el-input></el-descriptions-item>
+       <el-descriptions-item label="操作类型">
+         <dict-selector  :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" v-model="queryForm.operateType">
+
+         </dict-selector>
+       </el-descriptions-item>
        <el-descriptions-item label="新的预计进入公海的时间">
            <el-date-picker
           v-model="newEstimateEnterOpenSeaTimeArr"
@@ -32,7 +37,7 @@
        </el-descriptions-item>
        <el-descriptions-item>
          <el-button @click="getList">搜索</el-button>
-         <el-button @click="initialize">重置</el-button>
+         <el-button @click="initialize();getList()">重置</el-button>
        </el-descriptions-item>
      </el-descriptions>
    </el-card>
@@ -109,6 +114,9 @@
        <el-form-item label="老的预计进入公海时间:">
          {{parseTime(dataLog.oldEstimateEnterOpenSeaTime)}}
        </el-form-item>
+       <el-form-item label="备注:">
+         {{dataLog.remark}}
+       </el-form-item>
        <el-form-item label="更新json:">
          {{dataLog.updateBody}}
        </el-form-item>
@@ -165,6 +173,7 @@ export default {
         oldCustomerService:null,
         newCustomerService:null,
         operateType:null,
+
         operator:null,
         orderNo:null,
         newEstimateEnterOpenSeaTime:null,

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

@@ -107,7 +107,7 @@
        <template v-slot="{row}">
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:edit']" v-if="[0,2].includes(row.state)" @click="$router.push({path:'/financial/commission-requestFunds',query:{id:row.id}})" >{{$t('编辑')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:delete']" @click="deleteFn(row)" v-if="[0,2].includes(row.state)" > {{$t('删除')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:details']"  v-if="[7,3,1].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})"   >{{$t('审核详情')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:details']"  v-if="[7,3,1,5].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})"   >{{$t('审核详情')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn('取消审核',7, row, '取消审核' )"  >{{$t('取消审核')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn('付款单反审核', 1, row, '提交反审核',)" >{{$t('反审核')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn('付款单核销申请', 2, row, '提交核销')"  >{{$t('核销')}}</el-button>
@@ -127,7 +127,7 @@
       @pagination="getList"
     />
     <!--对话框 审核 -->
-    <el-dialog width="30%" :title="paymentTitle" :visible.sync="paymentShow">
+    <el-dialog @close="paymentValue = ''"  width="30%" :title="paymentTitle" :visible.sync="paymentShow">
       <div class="cancel_content">
         <span>{{ $t('申请理由') }}</span>
         <el-input type="textarea" :rows="6" v-model="paymentValue" :placeholder="$t('请输入取消理由')"></el-input>

src/views/ecw/financial/paymentVoucher.vue

@@ -149,9 +149,9 @@
           <el-button size="mini" v-has-permi="['ecw:paymentVoucher:Unapprove']" type="text" v-if="[1].includes(row.state)" @click="bridgeFn(1, '取消审核',row)">
             {{ $t('取消审核') }}
           </el-button>
-          <el-button size="mini" type="text" v-has-permi="['ecw:paymentVoucher:details']" v-if="[7,3,1].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button>
+          <el-button size="mini" type="text" v-has-permi="['ecw:paymentVoucher:details']" v-if="[7,3,1,5].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button>
           <el-button size="mini" type="text" v-has-permi="['ecw:paymentVoucher:Cancel-De-approval']" v-if="[3].includes(row.state)" @click="bridgeFn(2, '取消付款单反审核',row)" >{{ $t('取消反审核') }}</el-button>
-          <el-button size="mini" v-has-permi="['ecw:paymentVoucher:Cancel-Write-off']" type="text" v-if="[5].includes(row.state)" @click="bridgeFn(3, '取消付款单核销',row)"  >{{ $t('取消核销审核') }}</el-button>
+          <el-button size="mini" v-has-permi="['ecw:paymentVoucher:Cancel-Write-off']" type="text" v-if="[5].includes(row.state)" @click="bridgeFn(3, '取消付款单核销',row)"  >{{ $t('取消核销') }}</el-button>
 
           <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:De-approval']"
                      @click="bridgeFn(4, '反审核',row)">{{ $t('反审核') }}
@@ -217,14 +217,14 @@
       </div>
     </el-dialog>
     <!--对话框 审核 -->
-    <el-dialog width="30%" :title="examineTitle" :visible.sync="examineShow">
+    <el-dialog width="30%" @close="cancelReason = ''" :title="examineTitle" :visible.sync="examineShow">
       <div class="cancel_content">
         <span>{{ $t('申请理由') }}</span>
         <el-input type="textarea" :rows="6" v-model="cancelReason" :placeholder="$t('请输入取消理由')"></el-input>
       </div>
       <span slot="footer" class="dialog-footers">
         <el-button type="primary" @click="cancelWriteOffClick()">{{ $t('提交') }}</el-button>
-        <el-button @click="examineShow = false; cancelReason = '';">{{ $t('取消') }}</el-button>
+        <el-button @click="examineShow = false;">{{ $t('取消') }}</el-button>
       </span>
     </el-dialog>