Explorar o código

Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	vue.config.js
ccjgmwz %!s(int64=3) %!d(string=hai) anos
pai
achega
a8b1208c00

+ 4 - 2
public/static/payprint.html

@@ -142,12 +142,11 @@
         justify-content: space-between;
       }
       .sfcard {
-        /* background: red; */
       }
       .sfcard-content {
         display: flex;
-        flex-direction: column;
         align-items: center;
+        justify-content: space-evenly;
       }
       .sfcard-content img {
         width: 45%;
@@ -169,6 +168,9 @@
   <body>
     <div id="app">
       <div class="content" v-if="bigContent">
+        <div class="page1">
+
+        </div>
         <div class="sfcard" v-if="isShowPrintType1">
           <div class="sfcard-title">{{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}</div>
           <div class="sfcard-content">

+ 33 - 20
src/views/houseSelfCollect/paymentManagement.vue

@@ -67,7 +67,7 @@
       <el-table-column class="table_td" prop="paymentNo" width="100" label="编号" sortable></el-table-column>
       <el-table-column class="table_td" prop="customerName" label="客户" sortable>
         <template slot-scope="scope">
-          <div @click.stop="customer(scope.row)"><span>{{scope.row.customerName}}</span></div>
+          <div @click.stop="customer(scope.row)"><span :class="{ text_css: scope.row.textcss }">{{scope.row.customerName}}</span></div>
         </template>
       </el-table-column>
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
@@ -177,18 +177,16 @@
       </el-dialog>
     </div>
     <!--客户信息-->
-    <el-dialog width="50%" title="客户信息" :visible.sync="customerInfo" :append-to-body="true">
-      <el-form class="customer" :model="form">
-        <div v-if="customerlist.customerTypeFlag == '2'">
-          <h4>营业执照</h4>
-          <img width="50%" :src="customerlist.businessLicenseAddressUrl" alt class="img_css" />
-          <el-form-item label="公司名称" label-width="100px">
-            {{ customerlist.compName }}
-          </el-form-item>
-          <el-form-item label="纳税人识别号" label-width="100px">
-            {{ customerlist.payTaxesCard }}
-          </el-form-item>
-        </div>
+    <el-dialog
+      width="50%"
+      title="客户信息"
+      :visible.sync="customerInfo"
+      :append-to-body="true"
+      :close="customerclose"
+    >
+      <el-form class="customer">
+
+
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>身份证正面</h4>
@@ -224,21 +222,21 @@
         <el-form-item label="开户支行" label-width="100px">
           {{ customerlist.bankDepositBranch }}
         </el-form-item>
-        <el-form-item label="收款人姓名" :label-width="formLabelWidth" v-if="customerlist.customerTypeFlag == '1'">
+        <el-form-item label="收款人姓名" label-width="100px" v-if="customerlist.customerTypeFlag == '1'">
           {{ customerlist.payeeName }}
         </el-form-item>
-        <el-form-item label="收款人身份证号" :label-width="formLabelWidth" v-if="customerlist.customerTypeFlag == '1'">
+        <el-form-item label="收款人身份证号" label-width="120px" v-if="customerlist.customerTypeFlag == '1'">
           {{ customerlist.payeeNumberCard }}
         </el-form-item>
-        <el-form-item label="手机号" :label-width="formLabelWidth">
+        <el-form-item label="手机号" label-width="100px">
           {{ customerlist.customerPhone }}
         </el-form-item>
-        <el-form-item label="联系地址" :label-width="formLabelWidth">
+        <el-form-item label="联系地址" label-width="100px">
           {{ customerlist.compAddress }}
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="customerInfo = false">取 消</el-button>
+        <el-button @click="customerclose">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -419,11 +417,26 @@ import {
           .catch(() => {})
       },
       customer(row) {
-        this.customerInfo = true
+        for(let i = 0 ; i < this.paymentList.length ; i++){
+          if(row.id == this.paymentList[i].id){
+            row.textcss = true
+          }else{
+            this.paymentList[i].textcss = false
+          }
+        }
+        row.textcss = true
+        this. customerInfo = true
         this.customerlist = row.identityAuthenticationInfo
         this.customerlist.cardAddressUrl1 = this.customerlist.cardAddressUrl.split(',')[0]
         this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
         this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
+        this.$forceUpdate();
+      },
+      customerclose(e){
+        console.log(e)
+          //  row.textcss = false
+              this. customerInfo = false
+
       },
       //合计
       getSummaries(param) {
@@ -627,7 +640,7 @@ import {
         .then(response => {
           this.paymentList = response.records
           for(let i = 0 ; i < this.paymentList.length ; i++){
-            this.paymentList.textcss = ''
+            this.paymentList.textcss = false
           }
           this.deptBudgetTotal = response.total
         })

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 382 - 595
src/views/tranManagement/tranManagementShippingArrangemen.vue


+ 0 - 1
vue.config.js

@@ -142,7 +142,6 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         target: 'http://192.168.1.122:9100/',
-        // target: 'http://192.168.1.107:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio