Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -385,7 +385,7 @@
             </el-tab-pane>
             <el-tab-pane label="客户联系人" name="khlxk">
               <el-button type="primary" @click="corpsAttnAdd">新建</el-button>
-              <el-table :data="formData.corpsAttnList"
+              <el-table :data="formData.corpsAttnList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">
                 <el-table-column prop="code" label="编号" width="180" />
@@ -412,7 +412,7 @@
             </el-tab-pane>
             <el-tab-pane label="银行信息" name="yhxx">
               <el-button type="primary" @click="corpsAttnAdd">新建</el-button>
-              <el-table :data="formData.corpsBankList"
+              <el-table :data="formData.corpsBankList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">
                 <el-table-column prop="uscc" label="税号" width="180" />
@@ -441,7 +441,7 @@
             </el-tab-pane>
             <el-tab-pane label="附件" name="fj">
               <el-button type="primary" @click="corpsAttnAdd">新建</el-button>
-              <el-table :data="formData.corpsFilesList"
+              <el-table :data="formData.corpsFilesList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">
                 <el-table-column prop="sort" label="排序" />
@@ -468,7 +468,7 @@
             </el-tab-pane>
             <el-tab-pane label="更名记录" name="gmjl">
               <el-button type="primary" @click="corpsAttnAdd">新建</el-button>
-              <el-table :data="formData.corpsRenameList"
+              <el-table :data="formData.corpsRenameList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">
                 <el-table-column prop="oldCnName" label="原中文名称" />
@@ -488,7 +488,7 @@
             </el-tab-pane>
             <el-tab-pane label="发票抬头" name="fptt">
               <el-button type="primary" @click="corpsAttnAdd">新建</el-button>
-              <el-table :data="formData.corpsInvoiceHeaderList"
+              <el-table :data="formData.corpsInvoiceHeaderList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">
                 <!-- <el-table-column prop="pid" label="主表id" width="180" /> -->
@@ -524,7 +524,7 @@
             </el-tab-pane>
             <el-tab-pane label="不良记录" name="bljl">
               <el-button type="primary" @click="corpsAttnAdd">新建</el-button>
-              <el-table :data="formData.corpsBadrecordList"
+              <el-table :data="formData.corpsBadrecordList" border
                 :header-cell-style="{ background: '#ecf5ff', color: '#232526', fontSize: '12px' }" stripe
                 style="width: 100%">
                 <el-table-column prop="oldCreditLevel" label="原授信等级" />

src/views/iosBasicData/bcountrys/index.vue

@@ -184,6 +184,7 @@ export default {
                     {
                         label: "国际三字码",
                         prop: "unCode",
+                        width: "100",
                         rules: [{
                             pattern: /^[a-zA-Z0-9]{1,3}$/,
                             message: "请输入英文字母或数字",

src/views/wel/index.vue

@@ -1,47 +1,49 @@
 <template>
-  <div v-if="billType && saberTenantId != 212186 && saberTenantId != 504978">
-    <tongjiSchool v-if="billType == 1"></tongjiSchool>
-    <landTransportation v-else-if="billType == 7"></landTransportation>
-    <jiatongPage v-else-if="billType == 8"></jiatongPage>
-    <noctite v-else-if="billType == 9"></noctite>
-    <equipment-control v-else-if="billType == 10"></equipment-control>
-      <tireindex v-else-if="billType == 11" :sysType="billType"></tireindex>
-    <defaultPage v-else :sysType="billType"></defaultPage>
-  </div>
-    <div v-else-if="saberTenantId == 212186" style="padding: 10px">
-        <el-card class="home-container__card">
-            <div class="title">
-                <span>
-                    快速发起
-                </span>
-            </div>
-            <div class="content">
-                <div class="content-icon" @click="inPage('/productionManagement/index')">
-                    <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
-                    <span style="font-size: 14px">模拟生产</span>
-                </div>
-            </div>
-        </el-card>
-    </div>
-    <div v-else-if="saberTenantId == 504978" style="padding: 10px">
-        <el-card class="home-container__card">
-            <div class="title">
-                <span>
-                    快速发起
-                </span>
-            </div>
-            <div class="content">
-                <div class="content-icon" @click="inPage('/EquipmentArchives/index')">
-                    <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
-                    <span style="font-size: 14px">设备档案</span>
-                </div>
-                <div class="content-icon" @click="inPage('/maintenanceQ/index')">
-                    <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
-                    <span style="font-size: 14px">设备维修</span>
-                </div>
-            </div>
-        </el-card>
+  <dev v-if="saberTenantId != 409341">
+    <div v-if="billType && saberTenantId != 212186 && saberTenantId != 504978">
+      <tongjiSchool v-if="billType == 1"></tongjiSchool>
+      <landTransportation v-else-if="billType == 7"></landTransportation>
+      <jiatongPage v-else-if="billType == 8"></jiatongPage>
+      <noctite v-else-if="billType == 9"></noctite>
+      <equipment-control v-else-if="billType == 10"></equipment-control>
+        <tireindex v-else-if="billType == 11" :sysType="billType"></tireindex>
+      <defaultPage v-else :sysType="billType"></defaultPage>
     </div>
+      <div v-else-if="saberTenantId == 212186" style="padding: 10px">
+          <el-card class="home-container__card">
+              <div class="title">
+                  <span>
+                      快速发起
+                  </span>
+              </div>
+              <div class="content">
+                  <div class="content-icon" @click="inPage('/productionManagement/index')">
+                      <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
+                      <span style="font-size: 14px">模拟生产</span>
+                  </div>
+              </div>
+          </el-card>
+      </div>
+      <div v-else-if="saberTenantId == 504978" style="padding: 10px">
+          <el-card class="home-container__card">
+              <div class="title">
+                  <span>
+                      快速发起
+                  </span>
+              </div>
+              <div class="content">
+                  <div class="content-icon" @click="inPage('/EquipmentArchives/index')">
+                      <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
+                      <span style="font-size: 14px">设备档案</span>
+                  </div>
+                  <div class="content-icon" @click="inPage('/maintenanceQ/index')">
+                      <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
+                      <span style="font-size: 14px">设备维修</span>
+                  </div>
+              </div>
+          </el-card>
+      </div>
+  </dev>
 </template>
 
 <script>