From d2bc6e096f0806b78ea92d4b90a21d3627d406c7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 08 三月 2024 18:28:42 +0800
Subject: [PATCH] mrshi
---
company/src/views/enterprise/entrustedInvoicing.vue | 30 +++---
company/src/components/enterprise/OperaDispatchUnitWindow.vue | 4
company/src/components/business/OperaInsuranceApplyWindow.vue | 12 +-
company/src/views/business/taxes.vue | 11 +
company/src/components/business/OperaTaxesWindow.vue | 71 +++++++------
company/src/components/business/switchCourtDetaols.vue | 4
company/src/components/enterprise/commissionDetails.vue | 27 ++--
company/src/components/business/OperaCompanyWindow.vue | 10 +-
company/src/components/enterprise/entrustmentHistory.vue | 8
company/src/components/enterprise/entrustedInvoicingApplication.vue | 27 ++--
company/src/components/business/OperaSwitchCourtWindow.vue | 6
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 14 +-
company/src/views/enterprise/switchCourt.vue | 4
company/src/views/business/switchCourt.vue | 6
company/src/components/enterprise/factoryChange.vue | 2
company/src/assets/icons/company/image.png | 0
company/src/components/business/OperaApplyChangeDetailWindow.vue | 2
platform/src/views/login.vue | 2
company/src/components/business/ApplyChangeUnitDetails1.vue | 6
company/src/components/business/OperaPolicyListWindow.vue | 2
company/src/components/enterprise/dispatchUnitDetails.vue | 2
company/src/views/index.vue | 23 ++-
company/src/components/business/dispatchUnitDetailsPlat.vue | 10 +-
company/src/components/enterprise/addJobType.vue | 2
company/src/components/business/ApplyChangeUnitDetails.vue | 6
company/.env.development | 3
26 files changed, 155 insertions(+), 139 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 288a7da..3c0e838 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -6,10 +6,11 @@
# 浼佷笟绔�-浠佸悍
# VUE_APP_API = 'http://192.168.0.186:10031/'
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# 骞冲彴绔�-浠佸悍
# VUE_APP_API = 'http://192.168.0.186:10030/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 骞冲彴绔�-钀嶅
# VUE_APP_API = 'http://192.168.0.105:10023/'
diff --git a/company/src/assets/icons/company/image.png b/company/src/assets/icons/company/image.png
new file mode 100644
index 0000000..66204c1
--- /dev/null
+++ b/company/src/assets/icons/company/image.png
Binary files differ
diff --git a/company/src/components/business/ApplyChangeUnitDetails.vue b/company/src/components/business/ApplyChangeUnitDetails.vue
index 0207b3c..f1c9dd1 100644
--- a/company/src/components/business/ApplyChangeUnitDetails.vue
+++ b/company/src/components/business/ApplyChangeUnitDetails.vue
@@ -17,7 +17,7 @@
<div class="box_table_head_item">淇濆崟鍙�</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
- <div class="box_table_head_item">鎹㈠巶浜烘暟</div>
+ <div class="box_table_head_item">鏇存崲娲鹃仯鍗曚綅浜烘暟</div>
<div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
</div>
<div class="box_table_content " >
@@ -38,8 +38,8 @@
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">鍘熸淳閬ｅ崟浣�</div>
<div class="box_table_head_item">鍘熸墍灞炲伐绉�</div>
- <div class="box_table_head_item">鎹㈠巶鍚庢淳閬ｅ崟浣�</div>
- <div class="box_table_head_item">鎹㈠巶鍚庢墍灞炲伐绉�</div>
+ <div class="box_table_head_item">鏇存崲鍚庢淳閬ｅ崟浣�</div>
+ <div class="box_table_head_item">鏇存崲鍚庢墍灞炲伐绉�</div>
</div>
<div class="box_table_content" v-for="(item, index) in detailList" :key="index">
<div class="box_table_content_item">{{index + 1}}</div>
diff --git a/company/src/components/business/ApplyChangeUnitDetails1.vue b/company/src/components/business/ApplyChangeUnitDetails1.vue
index 76e5c08..f75288c 100644
--- a/company/src/components/business/ApplyChangeUnitDetails1.vue
+++ b/company/src/components/business/ApplyChangeUnitDetails1.vue
@@ -17,7 +17,7 @@
<div class="box_table_head_item">淇濆崟鍙�</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
- <div class="box_table_head_item">鎹㈠巶浜烘暟</div>
+ <div class="box_table_head_item">鏇存崲娲鹃仯鍗曚綅浜烘暟</div>
<div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
</div>
<div class="box_table_content " >
@@ -38,8 +38,8 @@
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">鍘熸淳閬ｅ崟浣�</div>
<div class="box_table_head_item">鍘熸墍灞炲伐绉�</div>
- <div class="box_table_head_item">鎹㈠巶鍚庢淳閬ｅ崟浣�</div>
- <div class="box_table_head_item">鎹㈠巶鍚庢墍灞炲伐绉�</div>
+ <div class="box_table_head_item">鏇存崲鍚庢淳閬ｅ崟浣�</div>
+ <div class="box_table_head_item">鏇存崲鍚庢墍灞炲伐绉�</div>
</div>
<div class="box_table_content" v-for="(item, index) in detailList" :key="index">
<div class="box_table_content_item">{{index + 1}}</div>
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 3964c18..73f704d 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -188,7 +188,7 @@
<OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<reinsurance ref="reinsurance" @success="successEvent" />
- <!-- 鎹㈠巶鐢宠 -->
+ <!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
<!-- 鎶曚繚璇︽儏 -->
<insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 2a80040..b431a27 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -21,9 +21,9 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
- <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鎹㈠巶鐢宠璇﹀崟',apply,model)">瀵煎嚭璇﹀崟</el-button>
+ <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇﹀崟',apply,model)">瀵煎嚭璇﹀崟</el-button>
<!-- <el-button v-if="[0, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('鐢宠閫�鍥�', {id: dataId})">鐢宠閫�鍥�</el-button>-->
- <el-button v-if="[5, 8].includes(model.status)" type="primary" @click="$refs.editFactoryChange.open('鎹㈠巶鐢宠', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
+ <el-button v-if="[5, 8].includes(model.status)" type="primary" @click="$refs.editFactoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
<el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
<el-button v-if="[0, 1, 3, 7].includes(model.status)" type="primary" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
@@ -31,7 +31,7 @@
<el-button v-if="[5, 8].includes(model.status)" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-else>
- <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鎹㈠巶鐢宠璇﹀崟',apply,model)">瀵煎嚭璇﹀崟</el-button>
+ <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇﹀崟',apply,model)">瀵煎嚭璇﹀崟</el-button>
<el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
<el-button v-if="[1,2,4].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
@@ -84,7 +84,7 @@
<el-table-column
prop="changeNum"
align="center"
- label="鎹㈠巶浜烘暟">
+ label="鏇存崲娲鹃仯鍗曚綅浜烘暟">
</el-table-column>
</el-table>
</div>
@@ -127,11 +127,11 @@
</el-table-column>
<el-table-column
prop="duName"
- label="鎹㈠巶鍚庢淳閬ｅ崟浣�">
+ label="鏇存崲鍚庢淳閬ｅ崟浣�">
</el-table-column>
<el-table-column
prop="workTypeName"
- label="鎹㈠巶鍚庢墍灞炲伐绉�">
+ label="鏇存崲鍚庢墍灞炲伐绉�">
</el-table-column>
<el-table-column
prop="endTime"
@@ -179,7 +179,7 @@
<OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
- <!-- 鎹㈠巶鐢宠 -->
+ <!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
<editFactoryChange ref="editFactoryChange" @success="successEvent" />
<!-- 鎶曚繚璇︽儏 -->
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index 2c6055a..dc1baad 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -62,11 +62,11 @@
<UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file2" @uploadSuccess="result2" />
</div>
</el-form-item>
- <el-form-item label="鐢靛瓙绛剧珷" prop="signImg">
- <div style="width: 100%; height: 100px; display: flex; align-items: center;">
- <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file3" @uploadSuccess="result3" />
- </div>
- </el-form-item>
+<!-- <el-form-item label="鐢靛瓙绛剧珷" prop="signImg">-->
+<!-- <div style="width: 100%; height: 100px; display: flex; align-items: center;">-->
+<!-- <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file3" @uploadSuccess="result3" />-->
+<!-- </div>-->
+<!-- </el-form-item>-->
</el-form>
<el-button type="primary" style="margin-bottom: 15px;" @click="add" v-if="form.type !== 1">娣诲姞</el-button>
<el-table
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index f31a0e6..7dddb82 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -13,7 +13,7 @@
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
<el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
<el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
- <el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.factoryChange.open('鎹㈠巶鐢宠', { id: dataId })">鎹㈠巶鐢宠</el-button>
+ <el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
</div>
</div>
<div class="desc_item_label">
@@ -98,7 +98,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="鍦ㄤ繚浜哄憳" name="0" ></el-tab-pane>
<el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
- <el-tab-pane label="鎹㈠巶璁板綍" name="2"></el-tab-pane>
+ <el-tab-pane label="鏇存崲娲鹃仯鍗曚綅璁板綍" name="2"></el-tab-pane>
</el-tabs>
</div>
<div class="desc_item_search">
@@ -352,7 +352,7 @@
:key="Math.random()"
prop="changeNum"
align="center"
- label="鎹㈠巶浜烘暟">
+ label="鏇存崲娲鹃仯鍗曚綅浜烘暟">
</el-table-column>
<el-table-column
:key="Math.random()"
@@ -371,7 +371,7 @@
align="center"
label="鎿嶄綔">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -415,11 +415,11 @@
<OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
- <!-- 鎹㈠巶鐢宠 -->
+ <!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
<!-- 鍔犲噺淇濊鎯� -->
<OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" @success="successEvent"/>
- <!-- 鎹㈠巶璇︽儏 -->
+ <!-- 鏇存崲娲鹃仯鍗曚綅璇︽儏 -->
<OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/>
<!-- 楠岃瘉鎵嬫満鍙� -->
<operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
diff --git a/company/src/components/business/OperaPolicyListWindow.vue b/company/src/components/business/OperaPolicyListWindow.vue
index af67c7b..8281f94 100644
--- a/company/src/components/business/OperaPolicyListWindow.vue
+++ b/company/src/components/business/OperaPolicyListWindow.vue
@@ -65,7 +65,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="鍦ㄤ繚浜哄憳" name="first"></el-tab-pane>
<el-tab-pane label="鍔�/鍑忎繚璁板綍" name="second"></el-tab-pane>
- <el-tab-pane label="鎹㈠巶璁板綍" name="third"></el-tab-pane>
+ <el-tab-pane label="鏇存崲娲鹃仯鍗曚綅璁板綍" name="third"></el-tab-pane>
</el-tabs>
</div>
<div class="desc_item_search">
diff --git a/company/src/components/business/OperaSwitchCourtWindow.vue b/company/src/components/business/OperaSwitchCourtWindow.vue
index 66a0245..4b3f054 100644
--- a/company/src/components/business/OperaSwitchCourtWindow.vue
+++ b/company/src/components/business/OperaSwitchCourtWindow.vue
@@ -15,7 +15,7 @@
<span>鎻愪氦鏃堕棿锛�2023-09-11 00:00:00</span>
</div>
<div class="desc_item_label_right">
- <el-button type="primary" @click="$refs.switchCourtDetaols.open('鎹㈠巶鐢宠鍗曡鎯�')">瀵煎嚭璇﹀崟</el-button>
+ <el-button type="primary" @click="$refs.switchCourtDetaols.open('鏇存崲娲鹃仯鍗曚綅鐢宠鍗曡鎯�')">瀵煎嚭璇﹀崟</el-button>
<el-button type="primary">鏌ョ湅鐢宠鍗�</el-button>
<el-button type="primary" @click="visible3 = true">涓婁紶鎵瑰崟</el-button>
<el-button type="danger" @click="visible1 = true">閫�鍥炴姇淇�</el-button>
@@ -93,11 +93,11 @@
</el-table-column>
<el-table-column
prop="address"
- label="鎹㈠巶鍚庢淳閬ｅ崟浣�">
+ label="鏇存崲鍚庢淳閬ｅ崟浣�">
</el-table-column>
<el-table-column
prop="address"
- label="鎹㈠巶鍚庢墍灞炲伐绉�">
+ label="鏇存崲鍚庢墍灞炲伐绉�">
</el-table-column>
</el-table>
<div class="desc_item_from_page">
diff --git a/company/src/components/business/OperaTaxesWindow.vue b/company/src/components/business/OperaTaxesWindow.vue
index 0fd9b66..eee0fe5 100644
--- a/company/src/components/business/OperaTaxesWindow.vue
+++ b/company/src/components/business/OperaTaxesWindow.vue
@@ -46,17 +46,18 @@
<div class="info_list_item_label">鎺ユ敹鍦板潃锛�</div>
<div class="info_list_item_val">{{ model.addr }}</div>
</div>
- <div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{ model.price }}</div>
- </div>
+<!-- <div class="info_list_item" style="width: 100%;">-->
+<!-- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>-->
+<!-- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{ model.price }}</div>-->
+<!-- </div>-->
</div>
+<!-- show-summary-->
+<!-- :summary-method="getSummaries1"-->
<el-table
v-if="model.applyType ==0"
:data="tableData"
border
- show-summary
- :summary-method="getSummaries1"
+
style="width: 100%; margin-bottom: 20px;">
<el-table-column
label="搴忓彿"
@@ -76,21 +77,22 @@
prop="applyCode"
label="淇濆崟鍙�">
</el-table-column>
- <el-table-column
- align="center"
- prop="fee"
- label="閲戦">
- <template slot-scope="{row}">
- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- align="center"-->
+<!-- prop="fee"-->
+<!-- label="閲戦">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
+<!-- show-summary-->
+<!-- :summary-method="getSummaries"-->
<el-table
v-if="model.applyType ==1"
:data="tableData1"
border
- show-summary
- :summary-method="getSummaries"
+
style="width: 100%; margin-bottom: 20px;">
<el-table-column
label="淇濆崟"
@@ -118,21 +120,22 @@
<span>{{row.changApplyCode ? row.changApplyCode : '-'}}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- prop="fee"
- label="閲戦">
- <template slot-scope="{row}">
- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- align="center"-->
+<!-- prop="fee"-->
+<!-- label="閲戦">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
+<!-- show-summary-->
+<!-- :summary-method="getSummaries"-->
<el-table
v-if="model.applyType == 1"
:data="tableData2"
border
- show-summary
- :summary-method="getSummaries"
+
style="width: 100%; margin-bottom: 20px;">
<el-table-column
label="鍐茬孩鍗�"
@@ -157,14 +160,14 @@
prop="taxCreateDate"
label="鐢宠寮�绁ㄦ椂闂�">
</el-table-column>
- <el-table-column
- align="center"
- prop="fee"
- label="鍙戠エ閲戦">
- <template slot-scope="{row}">
- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- align="center"-->
+<!-- prop="fee"-->
+<!-- label="鍙戠エ閲戦">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</div>
<span style="font-size: 14px;" v-if="model.status === 2">閫�鍥炲師鍥狅細{{model.cancelInfo}} 寮�绁ㄥ憳-{{model.cancelUserId}} {{model.cancelUserName}}</span>
diff --git a/company/src/components/business/dispatchUnitDetailsPlat.vue b/company/src/components/business/dispatchUnitDetailsPlat.vue
index b27251c..1534ca5 100644
--- a/company/src/components/business/dispatchUnitDetailsPlat.vue
+++ b/company/src/components/business/dispatchUnitDetailsPlat.vue
@@ -17,10 +17,10 @@
<div class="info_list_item_label">娲鹃仯鍗曚綅锛�</div>
<div class="info_list_item_val">{{form.name}}</div>
</div>
- <div class="info_list_item">
- <div class="info_list_item_label">娲鹃仯鍗曚綅淇＄敤浠ｇ爜锛�</div>
- <div class="info_list_item_val">{{form.code}}</div>
- </div>
+<!-- <div class="info_list_item">-->
+<!-- <div class="info_list_item_label">娲鹃仯鍗曚綅淇＄敤浠ｇ爜锛�</div>-->
+<!-- <div class="info_list_item_val">{{form.code}}</div>-->
+<!-- </div>-->
<div class="info_list_item">
<div class="info_list_item_label">娲鹃仯鍗曚綅鐘舵�侊細</div>
<div class="info_list_item_val" :class="'du-status'+form.unitStatus" v-if="form.unitStatus === 0">寰呭鏍�</div>
@@ -32,7 +32,7 @@
<div class="info_list_item_val" :class="'du-status'+form.unitStatus" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
</div>
<div class="info_list_item">
- <div class="info_list_item_label">娲鹃仯鍗曚綅璇﹁堪锛�</div>
+ <div class="info_list_item_label">宸ョ璇﹁堪锛�</div>
<div class="info_list_item_val">{{form.content}}</div>
</div>
</div>
diff --git a/company/src/components/business/switchCourtDetaols.vue b/company/src/components/business/switchCourtDetaols.vue
index 4a54799..567eedb 100644
--- a/company/src/components/business/switchCourtDetaols.vue
+++ b/company/src/components/business/switchCourtDetaols.vue
@@ -66,11 +66,11 @@
</el-table-column>
<el-table-column
prop="address"
- label="鎹㈠巶鍚庢淳閬ｅ崟浣�">
+ label="鏇存崲鍚庢淳閬ｅ崟浣�">
</el-table-column>
<el-table-column
prop="address"
- label="鎹㈠巶鍚庢墍灞炲伐绉�">
+ label="鏇存崲鍚庢墍灞炲伐绉�">
</el-table-column>
<el-table-column
prop="address"
diff --git a/company/src/components/enterprise/OperaDispatchUnitWindow.vue b/company/src/components/enterprise/OperaDispatchUnitWindow.vue
index 4f7bda4..4d4f3e5 100644
--- a/company/src/components/enterprise/OperaDispatchUnitWindow.vue
+++ b/company/src/components/enterprise/OperaDispatchUnitWindow.vue
@@ -13,7 +13,7 @@
<!-- <el-form-item label="娲鹃仯鍗曚綅淇＄敤浠ｇ爜" prop="code">-->
<!-- <el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>-->
<!-- </el-form-item>-->
- <el-form-item label="娲鹃仯鍗曚綅鎻忚堪" prop="content">
+ <el-form-item label="宸ョ鎻忚堪" prop="content">
<el-input v-model="form.content" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
</el-form>
@@ -63,7 +63,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="鎿嶄綔瑙嗛锛堥潪蹇呭～锛�">
+ label="鎿嶄綔瑙嗛">
<template slot-scope="scope">
<div style="width: 100px; height: 100px;">
<UploadAvatarVideo :uploadData="{ folder: 'unit' }" :file="scope.row.file" @uploadSuccess="result($event, index, scope.$index)" />
diff --git a/company/src/components/enterprise/addJobType.vue b/company/src/components/enterprise/addJobType.vue
index 7c422de..758419b 100644
--- a/company/src/components/enterprise/addJobType.vue
+++ b/company/src/components/enterprise/addJobType.vue
@@ -51,7 +51,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="鎿嶄綔瑙嗛锛堥潪蹇呭～锛�">
+ label="鎿嶄綔瑙嗛">
<template slot-scope="scope">
<div style="width: 100px; height: 100px;">
<UploadAvatarVideo :uploadData="{ folder: 'unit' }" :file="scope.row.file" @uploadSuccess="result($event, index, scope.$index)" />
diff --git a/company/src/components/enterprise/commissionDetails.vue b/company/src/components/enterprise/commissionDetails.vue
index 1f36186..10a8d91 100644
--- a/company/src/components/enterprise/commissionDetails.vue
+++ b/company/src/components/enterprise/commissionDetails.vue
@@ -30,10 +30,10 @@
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
<div class="info_list_item_val">{{model.taxAddr}}</div>
</div>
- <div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
- </div>
+<!-- <div class="info_list_item" style="width: 100%;">-->
+<!-- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>-->
+<!-- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>-->
+<!-- </div>-->
<div class="list" style="width: 100%;" v-if="form.type === 0">
<div class="list_label">
鎺ユ敹鏂瑰紡锛氱數瀛愬彂绁�
@@ -54,11 +54,12 @@
</div>
</div>
<!-- 鍔犲噺淇� -->
+<!-- show-summary-->
+<!-- :summary-method="getSummaries1"-->
<el-table
:data="list1"
border
- show-summary
- :summary-method="getSummaries1"
+
style="width: 100%; margin-bottom: 20px;">
<el-table-column
label="搴忓彿"
@@ -78,13 +79,13 @@
prop="applyCode"
label="淇濆崟鍙�">
</el-table-column>
- <el-table-column
- align="center"
- label="閲戦">
- <template slot-scope="{row}">
- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.totalFee}}</span>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- align="center"-->
+<!-- label="閲戦">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.totalFee}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</div>
<template v-slot:footer>
diff --git a/company/src/components/enterprise/dispatchUnitDetails.vue b/company/src/components/enterprise/dispatchUnitDetails.vue
index ddeb6c6..d3b84e6 100644
--- a/company/src/components/enterprise/dispatchUnitDetails.vue
+++ b/company/src/components/enterprise/dispatchUnitDetails.vue
@@ -27,7 +27,7 @@
<div class="info_list_item_val" style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
</div>
<div class="info_list_item">
- <div class="info_list_item_label">娲鹃仯鍗曚綅璇﹁堪锛�</div>
+ <div class="info_list_item_label">宸ョ璇﹁堪锛�</div>
<div class="info_list_item_val">{{form.content}}</div>
</div>
</div>
diff --git a/company/src/components/enterprise/entrustedInvoicingApplication.vue b/company/src/components/enterprise/entrustedInvoicingApplication.vue
index 60dfdab..d0e31d5 100644
--- a/company/src/components/enterprise/entrustedInvoicingApplication.vue
+++ b/company/src/components/enterprise/entrustedInvoicingApplication.vue
@@ -30,10 +30,10 @@
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
<div class="info_list_item_val">{{userInfo.company.taxAddr}}</div>
</div>
- <div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{total}}</div>
- </div>
+<!-- <div class="info_list_item" style="width: 100%;">-->
+<!-- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>-->
+<!-- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{total}}</div>-->
+<!-- </div>-->
<div class="list" style="width: 100%;">
<el-radio v-model="type" label="0">鐢靛瓙鍙戠エ</el-radio>
<div class="list_val">
@@ -49,11 +49,12 @@
</div>
</div>
</div>
+<!-- show-summary-->
+<!-- :summary-method="getSummaries"-->
<el-table
:data="form.list"
border
- show-summary
- :summary-method="getSummaries"
+
style="width: 100%; margin-bottom: 20px;">
<el-table-column
label="搴忓彿"
@@ -73,13 +74,13 @@
prop="code"
label="淇濆崟鍙�">
</el-table-column>
- <el-table-column
- align="center"
- label="閲戦">
- <template slot-scope="{row}">
- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.totalPrice}}</span>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- align="center"-->
+<!-- label="閲戦">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.totalPrice}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</div>
</GlobalWindow>
diff --git a/company/src/components/enterprise/entrustmentHistory.vue b/company/src/components/enterprise/entrustmentHistory.vue
index f3bff91..cbfe19d 100644
--- a/company/src/components/enterprise/entrustmentHistory.vue
+++ b/company/src/components/enterprise/entrustmentHistory.vue
@@ -32,10 +32,10 @@
<span v-else>寰呭鐞�</span>
</template>
</el-table-column>
- <el-table-column
- prop="price"
- label="寮�绁ㄩ噾棰濓紙鍏冿級">
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="price"-->
+<!-- label="寮�绁ㄩ噾棰濓紙鍏冿級">-->
+<!-- </el-table-column>-->
<el-table-column
label="鎺ユ敹鏂瑰紡">
<template slot-scope="{row}">
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 5d0f09c..83d76ed 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -333,7 +333,7 @@
return
}
}
- this.$refs.ApplyChangeUnitDetails1.open('鎹㈠巶璇﹀崟', this.form.factory, {...this.list[0], applyStartTime: this.form.applyStartTime})
+ this.$refs.ApplyChangeUnitDetails1.open('鏇存崲娲鹃仯鍗曚綅璇﹀崟', this.form.factory, {...this.list[0], applyStartTime: this.form.applyStartTime})
// this.form.factory.forEach(item => {
// item.idcardNo = item.idCard
// })
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index d8064f9..8df8196 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -75,15 +75,15 @@
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
- <el-table-column prop="changeNum" label="鎹㈠巶浜烘暟" min-width="100px"></el-table-column>
- <el-table-column prop="fee" label="璐圭敤鍙樻洿" min-width="100px"></el-table-column>
+ <el-table-column prop="changeNum" label="鏇存崲娲鹃仯鍗曚綅浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="fee" label="璐圭敤鍙樻洿鏇存崲娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
label="鎿嶄綔"
min-width="120"
fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('鏇存崲娲鹃仯鍗曚綅璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/company/src/views/business/taxes.vue b/company/src/views/business/taxes.vue
index b8a8de4..d4cbb21 100644
--- a/company/src/views/business/taxes.vue
+++ b/company/src/views/business/taxes.vue
@@ -59,11 +59,16 @@
<el-table-column prop="companyName" label="鐢宠浼佷笟" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
<el-table-column prop="createDate" label="鐢宠寮�绁ㄦ椂闂�" min-width="100px"></el-table-column>
<el-table-column prop="creatorName" label="鐢宠浜�" min-width="100px"></el-table-column>
- <el-table-column prop="price" label="寮�绁ㄩ噾棰濓紙鍏冿級" min-width="100px"></el-table-column>
+ <el-table-column label="寮�绁ㄩ噾棰濓紙鍏冿級" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.applyType === 0">-</span>
+ <span v-else>{{row.price}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鎶曚繚绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.applyType === 0">濮旀墭寮�绁�</span>
- <span v-if="row.applyType === 1">鐩翠繚</span>
+ <span v-if="row.applyType === 0">濮旀墭鎶曚繚</span>
+ <span v-if="row.applyType === 1">鐩存帴鎶曚繚</span>
</template>
</el-table-column>
<el-table-column prop="type" label="鎺ユ敹鏂瑰紡" min-width="100px">
diff --git a/company/src/views/enterprise/entrustedInvoicing.vue b/company/src/views/enterprise/entrustedInvoicing.vue
index 162a15a..d6708c6 100644
--- a/company/src/views/enterprise/entrustedInvoicing.vue
+++ b/company/src/views/enterprise/entrustedInvoicing.vue
@@ -25,21 +25,21 @@
</el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规"></el-table-column>
<el-table-column prop="code" label="淇濆崟鍙�"></el-table-column>
- <el-table-column label="宸蹭骇鐢熻垂鐢紙鍏冿級">
- <template slot-scope="{row}">
- <span>{{row.currentFee}}</span>
- </template>
- </el-table-column>
- <el-table-column label="宸插紑绁ㄨ垂鐢紙鍏冿級">
- <template slot-scope="{row}">
- <span>{{row.taxesMoney}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="fee" label="鏈紑绁ㄨ垂鐢紙鍏冿級">
- <template slot-scope="{row}">
- <span>{{row.currentFee - row.taxesMoney}}</span>
- </template>
- </el-table-column>
+<!-- <el-table-column label="宸蹭骇鐢熻垂鐢紙鍏冿級">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{row.currentFee}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="宸插紑绁ㄨ垂鐢紙鍏冿級">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{row.taxesMoney}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column prop="fee" label="鏈紑绁ㄨ垂鐢紙鍏冿級">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{row.currentFee - row.taxesMoney}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column prop="taxesLast" label="涓婃寮�绁ㄦ椂闂�"></el-table-column>
<el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
<el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
diff --git a/company/src/views/enterprise/switchCourt.vue b/company/src/views/enterprise/switchCourt.vue
index 58559f8..37e7eea 100644
--- a/company/src/views/enterprise/switchCourt.vue
+++ b/company/src/views/enterprise/switchCourt.vue
@@ -65,7 +65,7 @@
<el-table-column prop="validCode" label="鎵瑰崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
- <el-table-column prop="changeNum" label="鎹㈠巶浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="changeNum" label="鏇存崲娲鹃仯鍗曚綅浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="applyStartTime" label="鎵瑰崟鐢熸晥璧锋湡" min-width="100px"></el-table-column>
<el-table-column
@@ -74,7 +74,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 4546dd3..e00d8da 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -169,15 +169,20 @@
icon: require('../assets/icons/company/dipatch_unit.png')
},
{
- name: '鐩翠繚寮�绁�',
- url: '/enterprise/directInvoicing',
- icon: require('../assets/icons/company/tax.png')
- },
- {
- name: '濮旀墭淇濆紑绁�',
- url: '/enterprise/entrustedInvoicing',
- icon: require('../assets/icons/company/tax.png')
+ name: '鍛樺伐绠＄悊',
+ url: '/business/member',
+ icon: require('../assets/icons/company/image.png')
}
+ // {
+ // name: '鐩翠繚寮�绁�',
+ // url: '/enterprise/directInvoicing',
+ // icon: require('../assets/icons/company/tax.png')
+ // },
+ // {
+ // name: '濮旀墭淇濆紑绁�',
+ // url: '/enterprise/entrustedInvoicing',
+ // icon: require('../assets/icons/company/tax.png')
+ // }
],
catePlat: [
{
@@ -225,7 +230,7 @@
} else if (obj.objType === 1) {
this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: obj.param1 })
} else if (obj.objType === 2) {
- this.$refs.operaApplyChangeUnitDetailWindow.open('鎹㈠巶鐢宠璇︽儏', { id: obj.objId, applyId: obj.param1 })
+ this.$refs.operaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇︽儏', { id: obj.objId, applyId: obj.param1 })
} else if (obj.objType === 3) {
this.$refs.dispatchUnitDetailsPlat.open('娲鹃仯鍗曡鎯�', { id: obj.objId })
} else if (obj.objType === 4) {
diff --git a/platform/src/views/login.vue b/platform/src/views/login.vue
index b459972..90ed866 100644
--- a/platform/src/views/login.vue
+++ b/platform/src/views/login.vue
@@ -1,7 +1,7 @@
<template>
<div class="wrap">
<div class="introduce">
- <h2>棰勯�夋竻鍗曟煡璇㈢郴缁�</h2>
+ <h2>浜戞槗淇�</h2>
</div>
<div class="login">
<h1>绯荤粺鐧诲綍 / LOGIN IN</h1>
--
Gitblit v1.9.3