Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/Customers.vue

@@ -33,11 +33,12 @@
                 <span style="color:#606266;">{{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:15px;">客户：</span>
                 <span style="color:#606266;">{{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp; {{
-}}&nbsp;&nbsp;&nbsp;</span>
+                    }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:15px;">出访国家：</span>
-                <span style="color:#606266;">{{ delegationInfo.visitCountry|filter_city }}&nbsp;&nbsp;&nbsp;</span>
+                <span style="color:#606266;">{{ delegationInfo.visitCountry | filter_city }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:15px;">起止日期：</span>
-                <span style="color:#606266;">{{ delegationInfo.visitStartDate|filter_time }}—{{ delegationInfo.visitEndDate|filter_time}}&nbsp;&nbsp;&nbsp;</span>
+                <span style="color:#606266;">{{ delegationInfo.visitStartDate | filter_time }}—{{
+                    delegationInfo.visitEndDate | filter_time }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;font-size:15px;">天数/人数：</span>
                 <span style="color:#606266;">{{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人</span>
             </div>
@@ -54,11 +55,13 @@
                     </el-table-column>
                     <el-table-column prop="insuranceCosts,currencyStr" label="保险费用">
                         <template slot-scope="scope">
-                            {{  townum(scope.row.insuranceCosts) }}({{ scope.row.currencyStr }})
+                            {{ townum(scope.row.insuranceCosts) }}({{ scope.row.currencyStr }})
                         </template>
                     </el-table-column>
                     <el-table-column prop="isAuditGMStr" label="是否审核">
                     </el-table-column>
+                    <el-table-column prop="isPayStr" label="是否付款">
+                    </el-table-column>
                     <el-table-column prop="payName" label="支付方式">
                     </el-table-column>
                     <!-- <el-table-column prop="attachment" label="附 件">
@@ -110,7 +113,7 @@ export default {
     },
     methods: {
         //保留两位小数
-        townum(val){
+        townum(val) {
             return val.toFixed(2)
         },
         //每页条数改变时触发 选择一页显示多少行
@@ -278,14 +281,14 @@ export default {
 
         },
     },
-    filters:{
-        filter_city(value){
-            if(value){
-                return value.replaceAll('|','、')
+    filters: {
+        filter_city(value) {
+            if (value) {
+                return value.replaceAll('|', '、')
             }
         },
-        filter_time(value){
-            if(value){
+        filter_time(value) {
+            if (value) {
                 return value.split(" ")[0]
             }
         }
@@ -305,7 +308,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     min-height: 830px;
-    
+
 }
 
 .communal-title {

src/components/OP/OpCustomers.vue

@@ -1,27 +1,24 @@
 <template>
     <div class="car_add">
-        
+
         <div class="communal-title">
             <div>{{ title }}</div>
             <!-- 客户名单 -->
-            <el-popover
-            placement="bottom"
-            width="662"
-            trigger="hover">
+            <el-popover placement="bottom" width="662" trigger="hover">
                 <el-table max-height="600" border :data="rollcallarr">
                     <el-table-column width="100" property="date" label="姓名">
                         <template slot-scope="scope">
-                            {{ scope.row.lastName}}{{scope.row.firstName}}
+                            {{ scope.row.lastName }}{{ scope.row.firstName }}
                         </template>
                     </el-table-column>
                     <el-table-column width="200" property="lastName" label="拼音">
                         <template slot-scope="scope">
-                            {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                            {{ pinyingxing(scope.row.lastName) }}/{{ pinyingxing(scope.row.firstName) }}
                         </template>
                     </el-table-column>
                     <el-table-column width="50" property="sex" label="性别">
                         <template slot-scope="scope">
-                            {{ scope.row.sex==0?'男':'女'}}
+                            {{ scope.row.sex == 0 ? '男' : '女' }}
                         </template>
                     </el-table-column>
                     <el-table-column width="110" property="birthDay" label="生日">
@@ -39,7 +36,7 @@
                 <!-- <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span> -->
             </el-popover>
         </div>
-        
+
         <hr style='background-color:#5555; height:1px; border:none;margin: 10px 0;' />
         <div class="opcustomers-box">
             <el-form :model="delegationInfo" label-width="100px" class="demo-ruleForm">
@@ -175,7 +172,8 @@
                     </div>
                     <div style="width: 390px;">
                         <el-form-item label="消费日期:" prop="consumptionDate" label-width="160px">
-                            <el-date-picker value-format="yyyy-MM-dd" v-model="OpCustomersData.consumptionDate" placeholder="消费日期" type="date">
+                            <el-date-picker value-format="yyyy-MM-dd" v-model="OpCustomersData.consumptionDate"
+                                placeholder="消费日期" type="date">
                             </el-date-picker>
 
                         </el-form-item>
@@ -359,6 +357,7 @@ export default {
                 cRemark: '',
             },
             IsAuditGM: 0,
+            isPay: 0,
             VisitDate: '',
             passengerTypeSelect: [],
             transformDateFormat: function (value) {
@@ -414,17 +413,17 @@ export default {
                 totherSideName: [{ required: true, message: '对方姓名', trigger: ['blur', 'change'] },],
             },
             clientNameId: [],
-            rollcallarr:[],
+            rollcallarr: [],
         }
     },
     methods: {
         //拼音
-        pinyingxing(val){
+        pinyingxing(val) {
             return pinyin(val, { toneType: 'none' }).toUpperCase();
         },
         //fenge
-        fgarr(val){
-            val=val+""
+        fgarr(val) {
+            val = val + ""
             return val.split(' ')[0]
         },
         //初始化下拉框
@@ -502,7 +501,7 @@ export default {
             var that = this;
             setTimeout(function () {
                 that.PostTourClientListByDiId(val);
-            },500)
+            }, 500)
             for (let index = 0; index < that.delegationInfoList.length; index++) {
                 if (that.delegationInfoList[index].id == that.OpCustomersData.diId) {
                     that.delegationInfo = that.delegationInfoList[index];
@@ -614,6 +613,7 @@ export default {
                     var CreditCardPayment = res.data.data.creditCard;
                     var Customers = res.data.data.customers;
                     that.IsAuditGM = CreditCardPayment.isAuditGM;
+                    that.isPay = CreditCardPayment.isPay;
                     that.OpCustomersData.iid = Customers.iid
                     for (let index = 0; index < that.insuranceCostList.length; index++) {
                         if (that.insuranceCostList[index].id == that.OpCustomersData.iid) {
@@ -652,21 +652,21 @@ export default {
             })
         },
         //处理时间
-        getdate(val){
-            var date=new Date(val);
-            var y=date.getFullYear();
-            var m=date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1;
-            var d=date.getDate()<10?'0'+date.getDate():date.getDate();
-            return y+'-'+m+'-'+d
+        getdate(val) {
+            var date = new Date(val);
+            var y = date.getFullYear();
+            var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+            var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+            return y + '-' + m + '-' + d
         },
         addBtn() {
-            if(this.OpCustomersData.payDId!=72){
-                this.OpCustomersData.ctdId=0;
-                this.OpCustomersData.bankNo="";
-                this.OpCustomersData.cardholderName="";
+            if (this.OpCustomersData.payDId != 72) {
+                this.OpCustomersData.ctdId = 0;
+                this.OpCustomersData.bankNo = "";
+                this.OpCustomersData.cardholderName = "";
             }
-            if (this.IsAuditGM == 1) {
-                this.$message.error('已通过审核，不可修改！');
+            if (this.isPay == 1) {
+                this.$message.error('已付款，不可修改！');
             } else {
                 if (this.OpCustomersData.diId == null || this.OpCustomersData.diId == undefined || this.OpCustomersData.diId == "") {
                     this.$message.error("请选择团组名称");
@@ -864,7 +864,7 @@ export default {
         */
         //获取客户名单info
         PostTourClientListByDiId(val) {
-            this.rollcallarr=[];
+            this.rollcallarr = [];
             var that = this
             var url = "/api/Groups/PostTourClientListByDiId"
             this.$axios({
@@ -874,14 +874,14 @@ export default {
                     Authorization: 'Bearer ' + that.token
                 },
                 data: {
-                    portType:1,
-                    diid: val?val:that.OpCustomersData.diId,
-                    pageId:104,
-                    userId:233
+                    portType: 1,
+                    diid: val ? val : that.OpCustomersData.diId,
+                    pageId: 104,
+                    userId: 233
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    that.rollcallarr=res.data.data;
+                    that.rollcallarr = res.data.data;
                 } else {
                     that.$message.error(res.data.msg);
                 }