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

src/views/ecw/financial/bankDetail.vue

@@ -13,7 +13,7 @@
               </div>
             </el-form-item>
             <el-form-item :label="$t('收款账户')" prop="accountNo">
-              <span>{{ addForm.accountNo }}</span>
+              <span>{{ addForm.accountNo+'('+addForm.accountName+')' }}</span>
             </el-form-item>
             <el-form-item :label="$t('实收日期')" prop="amountDate">
               <span>{{ addForm.amountDate }}</span>
@@ -23,14 +23,7 @@
                 <span>{{ addForm.amount }}</span>
               </el-form-item>
               <el-form-item label-width="0px" prop="currencyId">
-                <el-select v-model="addForm.currencyId" :disabled="true">
-                  <el-option
-                    v-for="item in currencyList"
-                    :key="item.id"
-                    :label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn"
-                    :value="item.id"
-                  />
-                </el-select>
+                <span>（{{getCurrencyLabel(showCurrencyId)}}）</span>
               </el-form-item>
             </div>
             <el-form-item

src/views/ecw/financial/creatCollection.vue

@@ -13,12 +13,11 @@
         <!-- <el-descriptions :column="3" border>-->
           <!-- <el-descriptions-item > -->
             <el-form-item
-              :label="$t('客户')"
               style="margin-bottom: 0;margin-top: 20px;"
               prop="customerId"
               :span="4"
-              :rules="{ required: true, trigger: ['blur', 'change'], message: $t('客户不能为空') }"
             >
+            <span style="margin-right:20px"><span style="color: #ff4949;">*</span>{{$t('客户')}}</span>
               <customer-selector
                 v-model="form.customerId"
                 @change="customerChange"
@@ -27,12 +26,11 @@
   <!--        </el-descriptions-item>
           <el-descriptions-item > -->
             <el-form-item
-              :label="$t('部门')"
               style="margin-bottom: 0;margin-top: 20px;"
               prop="departmentId"
               :span="4"
-              :rules="{ required: true, trigger: ['blur', 'change'], message: $t('部门不能为空') }"
             >
+            <span style="margin-right:20px"><span style="color: #ff4949;">*</span>{{$t('部门')}}:</span>
               <el-select
                 v-model="form.departmentId"
                 style="width: 300px"
@@ -47,12 +45,11 @@
               </el-select>
             </el-form-item>
             <el-form-item
-              :label="$t('业务员')"
               style="margin-bottom: 0;margin-top: 20px;"
               prop="salesmanId"
               :span="4"
-              :rules="{ required: true, trigger: ['blur', 'change'], message: $t('业务员不能为空') }"
             >
+            <span style="margin-right:20px"><span style="color: #ff4949;">*</span>{{$t('业务员')}}:</span>
               <el-select v-model="form.salesmanId" filterable :placeholder="$t('请选择业务员')" @change="v => form.salesmanName = creatorData.find(t => t.id === v).nickname">
                 <el-option
                   v-for="item in creatorData"
@@ -78,11 +75,12 @@
 <!--          </el-descriptions-item>
           <el-descriptions-item > -->
             <el-form-item
-              :label="$t('备注')"
+             :label="$t('备注')+':'"
               style="margin-bottom: 0;margin-top: 20px;"
+              label-width="55px"
               prop="remark"
             >
-              <el-input v-model="form.remark" :placeholder="$t('备注')"></el-input>
+              <el-input style="display:inline-block;" v-model="form.remark" :placeholder="$t('备注')"></el-input>
             </el-form-item>
           <!-- </el-descriptions-item> -->
         <!-- </el-descriptions> -->
@@ -163,12 +161,10 @@
 <!--        <el-descriptions :column="2" border class="card">
           <el-descriptions-item > -->
             <el-form-item
-              :label="$t('是否需要开票')+':'"
               style="margin-bottom: 0;margin-top: 20px;"
               prop="openInvoice"
-              required
-              :rules="{ required: true, trigger: ['blur', 'change'], message: $t('请选择是否需要开票') }"
             >
+            <span style="margin-right:20px"><span style="color: #ff4949;">*</span>{{$t('是否需要开票')}}:</span>
               <el-select
                 v-model="form.openInvoice"
                 :placeholder="$t('请选择是否需要开票')"
@@ -1193,6 +1189,8 @@ export default {
         discountRemark: this.discountForm.discountRemark,
         orderNo: this.selectListRow.orderNo,
         orderId: this.selectListRow.orderId,
+        taxPoint:this.selectListRow.taxPoint,
+        taxAmount:this.selectListRow.taxAmount,
       }
        updateReceivableDiscountById(params).then(res => {
         if (this.selectListRow.discountTotal) {
@@ -1251,9 +1249,27 @@ export default {
     submitForm(addType) {
       const params = {...this.form}
       params.addType = addType
-
       // params.receiptAccountList = params.receiptAccountList.map(v => Object.assign(v, {  }))
-
+      if(!params.customerId){
+        this.saveBtnLoading = false
+        this.$modal.msgError(this.$t('客户不能为空'));
+        return
+      }
+      if(!params.departmentId){
+        this.saveBtnLoading = false
+        this.$modal.msgError(this.$t('部门不能为空'));
+        return
+      }
+      if(!params.salesmanId){
+        this.saveBtnLoading = false
+        this.$modal.msgError(this.$t('业务员不能为空'));
+        return
+      }
+      if(!params.openInvoice){
+        this.saveBtnLoading = false
+        this.$modal.msgError(this.$t('请选择是否需要开票'));
+        return
+      }
       if (this.list && this.list.length > 0) {
         params.receivableVOList = this.list
       }else{

src/views/ecw/financial/receiptDetail.vue

@@ -336,7 +336,7 @@
             <el-select v-if="!isView" v-model="addForm.accountId" :placeholder="$t('请选择收款账户')" style="width: 220px" @change="accountChange">
               <el-option v-for="item in bankData" :key="item.id" :label="item.baAccountName + '(' + item.baAccountNum + ')'" :value="item.id" />
             </el-select>
-            <span v-else>{{ addForm.accountNo }}</span>
+            <span v-else>{{ addForm.accountNo+'('+addForm.accountName+')' }}</span>
           </el-form-item>
           <el-form-item
             :label="$t('实收日期')"

src/views/ecw/financial/voucher.vue

@@ -118,7 +118,7 @@
             @click="verificationCancelClick(scope.row)"
             >{{ $t('查看')}}</el-button>
           <el-button
-            v-if="scope.row.state === 0 || scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3|| scope.row.state == 8"
+            v-if="scope.row.state === 0"
             size="mini"
             type="text"
             v-hasPermi="['ecw:voucher:edit']"
@@ -189,7 +189,7 @@
             >{{ $t('开票') }}</el-button
           >
           <el-button v-if="scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3"  v-hasPermi="['ecw:voucher:payment']" size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ $t('收款') }}</el-button>
-          <el-button v-if="[0,1,8].indexOf(scope.row.state) > -1" size="mini" type="text"  v-hasPermi="['ecw:voucher:delete']" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
+          <el-button v-if="scope.row.state == 0" size="mini" type="text"  v-hasPermi="['ecw:voucher:delete']" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
           <el-button
             v-if="scope.row.state != 0 && scope.row.state != 7 && scope.row.state != 11 && scope.row.state != 8 && scope.row.state != 9"
             size="mini"