Merge branch '1025branch'

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -41,11 +41,12 @@
       </el-table-column> -->
       <!-- <el-table-column label="部门id" align="center" prop="deptId">
       </el-table-column> -->
-      <el-table-column label="部门名称" width="220" show-overflow-tooltip align="center" prop="deptName">
+
+      <el-table-column label="企业名称" width="220" show-overflow-tooltip align="center" prop="deptName">
       </el-table-column>
-      <el-table-column label="规模以上工业产值" width="180" show-overflow-tooltip  align="center" prop="gmysgycz">
+      <el-table-column label="规模以上工业产值(万元)" width="180" show-overflow-tooltip  align="center" prop="gmysgycz">
       </el-table-column>
-      <el-table-column label="固定资产投资" width="140" show-overflow-tooltip  align="center" prop="gdzctz">
+      <el-table-column label="固定资产投资(万元)" width="140" show-overflow-tooltip  align="center" prop="gdzctz">
       </el-table-column>
       <el-table-column label="资产分类 " width="220" show-overflow-tooltip  align="center" prop="zcfl">
       </el-table-column>
@@ -53,33 +54,34 @@
       </el-table-column>
       <el-table-column label="电子账册分类 "  width="220" show-overflow-tooltip   align="center" prop="dzzcfl">
       </el-table-column>
-      <el-table-column label="进、出口总值"  width="140" show-overflow-tooltip   align="center" prop="jckzz">
+<<<<<<< HEAD
+      <el-table-column label="进、出口总值(万元)"  width="140" show-overflow-tooltip   align="center" prop="jckzz">
       </el-table-column>
-      <el-table-column label="进口总值"  width="140" show-overflow-tooltip   align="center" prop="jkzz">
+      <el-table-column label="进口总值(万元)"  width="140" show-overflow-tooltip   align="center" prop="jkzz">
       </el-table-column>
-      <el-table-column label="出口总值"  width="140" show-overflow-tooltip   align="center" prop="ckzz">
+      <el-table-column label="出口总值(万元)"  width="140" show-overflow-tooltip   align="center" prop="ckzz">
       </el-table-column>
-      <el-table-column label="加工贸易进出口值 "  width="220" show-overflow-tooltip   align="center" prop="jgmyjckz">
+      <el-table-column label="加工贸易进出口值(万元) "  width="220" show-overflow-tooltip   align="center" prop="jgmyjckz">
       </el-table-column>
-      <el-table-column label="物流货物进出口值 "  width="220" show-overflow-tooltip   align="center" prop="wlhwjckz">
+      <el-table-column label="物流货物进出口值(万元) "  width="220" show-overflow-tooltip   align="center" prop="wlhwjckz">
       </el-table-column>
-      <el-table-column label="一般贸易进出口值 "  width="220" show-overflow-tooltip   align="center" prop="ybmyjckz">
+      <el-table-column label="一般贸易进出口值(万元) "  width="220" show-overflow-tooltip   align="center" prop="ybmyjckz">
       </el-table-column>
-      <el-table-column label="海关税收"  width="140" show-overflow-tooltip   align="center" prop="hgss">
+      <el-table-column label="海关税收(万元)"  width="140" show-overflow-tooltip   align="center" prop="hgss">
       </el-table-column>
-      <el-table-column label="税务部门税收"  width="220" show-overflow-tooltip   align="center" prop="swbmss">
+      <el-table-column label="税务部门税收(万元)"  width="220" show-overflow-tooltip   align="center" prop="swbmss">
       </el-table-column>
-      <el-table-column label="期末企业从业人员"  width="220" show-overflow-tooltip   align="center" prop="qmqycyry">
+      <el-table-column label="期末企业从业人员(人)"  width="220" show-overflow-tooltip   align="center" prop="qmqycyry">
       </el-table-column>
-      <el-table-column label="实际使用外资金额"  width="220" show-overflow-tooltip   align="center" prop="sjsywzje">
+      <el-table-column label="实际使用外资金额(万美元)"  width="220" show-overflow-tooltip   align="center" prop="sjsywzje">
       </el-table-column>
-      <el-table-column label="维修业务进出口值 "  width="220" show-overflow-tooltip   align="center" prop="wxyejckz">
+      <el-table-column label="维修业务进出口值(万元) "  width="220" show-overflow-tooltip   align="center" prop="wxyejckz">
       </el-table-column>
-      <el-table-column label="研发业务进出口值 "  width="220" show-overflow-tooltip   align="center" prop="yfywjckz">
+      <el-table-column label="研发业务进出口值(万元) "  width="220" show-overflow-tooltip   align="center" prop="yfywjckz">
       </el-table-column>
-      <el-table-column label="租赁贸易进出口值 "  width="220" show-overflow-tooltip   align="center" prop="zlmyjckz">
+      <el-table-column label="租赁贸易进出口值(万元) "  width="220" show-overflow-tooltip   align="center" prop="zlmyjckz">
       </el-table-column>
-      <el-table-column label="跨境电商业务进出口值 "  width="220" show-overflow-tooltip   align="center" prop="kjdsywjckz">
+      <el-table-column label="跨境电商业务进出口值(万元) "  width="220" show-overflow-tooltip   align="center" prop="kjdsywjckz">
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="120" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -133,32 +135,32 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="海关税收" prop="hgss">
+                <el-form-item label="海关税收(万元)" prop="hgss">
                   <el-input v-model="form.hgss" placeholder="请输入海关税收"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="税务部门税收" prop="swbmss">
+                <el-form-item label="税务部门税收(万元)" prop="swbmss">
                   <el-input v-model="form.swbmss" placeholder="请输入税务部门税收"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="期末企业从业人员" prop="qmqycyry">
+                <el-form-item label="期末企业从业人员(万元)" prop="qmqycyry">
                   <el-input v-model="form.qmqycyry" placeholder="请输入期末企业从业人员"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="实际使用外资金额" prop="sjsywzje">
+                <el-form-item label="实际使用外资金额(万美元)" prop="sjsywzje">
                   <el-input v-model="form.sjsywzje" placeholder="请输入实际使用外资金额"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="固定资产投资" prop="gdzctz">
+                <el-form-item label="固定资产投资(万元)" prop="gdzctz">
                   <el-input v-model="form.gdzctz" placeholder="请输入固定资产投资"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="经营总收入" prop="jysr">
+                <el-form-item label="经营总收入(万元)" prop="jysr">
                   <el-input v-model="form.jysr" placeholder="请输入经营总收入"></el-input>
                 </el-form-item>
               </el-col>
@@ -169,57 +171,57 @@
           <el-form ref="form" :model="form" :rules="rules" label-width="180px">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="规模以上工业产值" prop="gmysgycz">
+                <el-form-item label="规模以上工业产值(万元)" prop="gmysgycz">
                   <el-input type="number" v-model="form.gmysgycz" placeholder="请输入规模以上工业产值"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="进出口总值" prop="jckzz">
+                <el-form-item label="进出口总值(万元)" prop="jckzz">
                   <el-input type="number" v-model="form.jckzz" placeholder="请输入进出口总值"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="进口总值" prop="jkzz">
+                <el-form-item label="进口总值(万元)" prop="jkzz">
                   <el-input type="number" v-model="form.jkzz" placeholder="请输入进口总值"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="出口总值" prop="ckzz">
+                <el-form-item label="出口总值(万元)" prop="ckzz">
                   <el-input type="number" v-model="form.ckzz" placeholder="请输入出口总值"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="加工贸易进出口值 " prop="jgmyjckz">
+                <el-form-item label="加工贸易进出口值(万元)" prop="jgmyjckz">
                   <el-input type="number" v-model="form.jgmyjckz" placeholder="请输入加工贸易进出口值 "></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="物流货物进出口值 " prop="wlhwjckz">
+                <el-form-item label="物流货物进出口值(万元)" prop="wlhwjckz">
                   <el-input type="number" v-model="form.wlhwjckz" placeholder="请输入物流货物进出口值 "></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="一般贸易进出口值 " prop="ybmyjckz">
+                <el-form-item label="一般贸易进出口值(万元)" prop="ybmyjckz">
                   <el-input type="number" v-model="form.ybmyjckz" placeholder="请输入一般贸易进出口值 "></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="维修业务进出口值 " prop="wxyejckz">
+                <el-form-item label="维修业务进出口值(万元)" prop="wxyejckz">
                   <el-input type="number" v-model="form.wxyejckz" placeholder="请输入维修业务进出口值 "></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="研发业务进出口值 " prop="yfywjckz">
+                <el-form-item label="研发业务进出口值(万元)" prop="yfywjckz">
                   <el-input type="number" v-model="form.yfywjckz" placeholder="请输入研发业务进出口值 "></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="租赁贸易进出口值 " prop="zlmyjckz">
+                <el-form-item label="租赁贸易进出口值(万元)" prop="zlmyjckz">
                   <el-input type="number" v-model="form.zlmyjckz" placeholder="请输入租赁贸易进出口值 "></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="跨境电商业务进出口值 " prop="kjdsywjckz">
+                <el-form-item label="跨境电商业务进出口值(万元)" prop="kjdsywjckz">
                   <el-input type="number" v-model="form.kjdsywjckz" placeholder="请输入跨境电商业务进出口值 "></el-input>
                 </el-form-item>
               </el-col>

src/views/GARDENTRADEDATA/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="cmain">
     <el-form ref="form" :model="form" :rules="rules" label-width="200px">
-      <el-form-item label="企业出口退税额" prop="companyDrawback">
+      <el-form-item label="企业出口退税额(万元)" prop="companyDrawback">
         <el-input
           type="number"
           v-model="form.companyDrawback"
@@ -9,7 +9,7 @@
         ></el-input>
       </el-form-item>
 
-      <el-form-item label="园区出口退税总额" prop="gardenDrawback">
+      <el-form-item label="园区出口退税总额(万元)" prop="gardenDrawback">
         <el-input
           type="number"
           v-model="form.gardenDrawback"
@@ -17,7 +17,7 @@
         ></el-input>
       </el-form-item>
 
-      <el-form-item label="园区运营单位缴税总额" prop="gardenTax">
+      <el-form-item label="园区运营单位缴税总额(万元)" prop="gardenTax">
         <el-input
           type="number"
           v-model="form.gardenTax"

src/views/GARDENTRADEDATA/index.vue

@@ -72,17 +72,17 @@
           {{scope.row.gardenName}}
         </template>
       </el-table-column>
-      <el-table-column label="企业出口退税额" align="center" prop="companyDrawback" width="130">
+      <el-table-column label="企业出口退税额(万元)" align="center" prop="companyDrawback" width="130">
         <template slot-scope="scope">
           {{scope.row.companyDrawback}}
         </template>
       </el-table-column>
-      <el-table-column label="园区出口退税总额" align="center" prop="gardenDrawback" width="140">
+      <el-table-column label="园区出口退税总额(万元)" align="center" prop="gardenDrawback" width="140">
         <template slot-scope="scope">
           {{scope.row.gardenDrawback}}
         </template>
       </el-table-column>
-      <el-table-column label="园区运营单位缴税总额" align="center" prop="gardenTax" width="170">
+      <el-table-column label="园区运营单位缴税总额(万元)" align="center" prop="gardenTax" width="170">
         <template slot-scope="scope">
           {{scope.row.gardenTax}}
         </template>