Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
gdc
/
yiliangyiyun-pc
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

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

# Conflicts:
#	vue.config.js
ccjgmwz 3 vuotta sitten
vanhempi
1728a41df2 c0f9dbecb7
commit
a8b1208c00
4 muutettua tiedostoa jossa 419 lisäystä ja 618 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 4 2
      public/static/payprint.html
  2. 33 20
      src/views/houseSelfCollect/paymentManagement.vue
  3. 382 595
      src/views/tranManagement/tranManagementShippingArrangemen.vue
  4. 0 1
      vue.config.js

+ 4 - 2
public/static/payprint.html
Näytä tiedosto 

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

+ 33 - 20
src/views/houseSelfCollect/paymentManagement.vue
Näytä tiedosto 

@@ -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="paymentNo" width="100" label="编号" sortable></el-table-column>
 
       <el-table-column class="table_td" prop="customerName" label="客户" sortable>
 
       <el-table-column class="table_td" prop="customerName" label="客户" sortable>
 
         <template slot-scope="scope">
 
         <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>
 
         </template>
 
       </el-table-column>
 
       </el-table-column>
 
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
 
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
 
@@ -177,18 +177,16 @@
 
       </el-dialog>
 
       </el-dialog>
 
     </div>
 
     </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 class="flex">
 
           <div style="flex: 1; text-align: center">
 
           <div style="flex: 1; text-align: center">
 
             <h4>身份证正面</h4>
 
             <h4>身份证正面</h4>
 
@@ -224,21 +222,21 @@
 
         <el-form-item label="开户支行" label-width="100px">
 
         <el-form-item label="开户支行" label-width="100px">
 
           {{ customerlist.bankDepositBranch }}
 
           {{ customerlist.bankDepositBranch }}
 
         </el-form-item>
 
         </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 }}
 
           {{ customerlist.payeeName }}
 
         </el-form-item>
 
         </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 }}
 
           {{ customerlist.payeeNumberCard }}
 
         </el-form-item>
 
         </el-form-item>
 
-        <el-form-item label="手机号" :label-width="formLabelWidth">
 
+        <el-form-item label="手机号" label-width="100px">
 
           {{ customerlist.customerPhone }}
 
           {{ customerlist.customerPhone }}
 
         </el-form-item>
 
         </el-form-item>
 
-        <el-form-item label="联系地址" :label-width="formLabelWidth">
 
+        <el-form-item label="联系地址" label-width="100px">
 
           {{ customerlist.compAddress }}
 
           {{ customerlist.compAddress }}
 
         </el-form-item>
 
         </el-form-item>
 
       </el-form>
 
       </el-form>
 
       <div slot="footer" class="dialog-footer">
 
       <div slot="footer" class="dialog-footer">
 
-        <el-button @click="customerInfo = false">取 消</el-button>
 
+        <el-button @click="customerclose">取 消</el-button>
 
       </div>
 
       </div>
 
     </el-dialog>
 
     </el-dialog>
 
   </div>
 
   </div>
 
@@ -419,11 +417,26 @@ import {
 
           .catch(() => {})
 
           .catch(() => {})
 
       },
 
       },
 
       customer(row) {
 
       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 = row.identityAuthenticationInfo
 
         this.customerlist.cardAddressUrl1 = this.customerlist.cardAddressUrl.split(',')[0]
 
         this.customerlist.cardAddressUrl1 = this.customerlist.cardAddressUrl.split(',')[0]
 
         this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
 
         this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
 
         this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
 
         this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
 
+        this.$forceUpdate();
 
+      },
 
+      customerclose(e){
 
+        console.log(e)
 
+          //  row.textcss = false
 
+              this. customerInfo = false
 
+
 
       },
 
       },
 
       //合计
 
       //合计
 
       getSummaries(param) {
 
       getSummaries(param) {
 
@@ -627,7 +640,7 @@ import {
 
         .then(response => {
 
         .then(response => {
 
           this.paymentList = response.records
 
           this.paymentList = response.records
 
           for(let i = 0 ; i < this.paymentList.length ; i++){
 
           for(let i = 0 ; i < this.paymentList.length ; i++){
 
-            this.paymentList.textcss = ''
 
+            this.paymentList.textcss = false
 
           }
 
           }
 
           this.deptBudgetTotal = response.total
 
           this.deptBudgetTotal = response.total
 
         })
 
         })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 382 - 595
src/views/tranManagement/tranManagementShippingArrangemen.vue


+ 0 - 1
vue.config.js
Näytä tiedosto 

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

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä