Merge remote-tracking branch 'origin/20240109-yw' into 20240109-yw

src/views/anno/anncmnt/devDialog.vue

@@ -295,8 +295,8 @@
               </el-col>
          </el-row>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
     </el-card>
      </el-form>

src/views/anno/anncmnt/manuCertDialog.vue

@@ -118,8 +118,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/anno/anncmnt/manuDialog.vue

@@ -106,8 +106,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/anno/anncmnt/productCertDialog.vue

@@ -118,8 +118,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/anno/anncmnt/productDialog.vue

@@ -103,8 +103,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/anno/anncmnt/ylqxzcrDialog.vue

@@ -106,8 +106,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/anno/anncmnt/ylqxzczhDialog.vue

@@ -106,8 +106,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/basic/client/cert/certDialog.vue

@@ -115,8 +115,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button v-if="formName != 3" type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/basic/client/manu/ylqxzczhManuDialog.vue

@@ -114,8 +114,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/basic/client/product/ylqxzczhManuDialog.vue

@@ -115,8 +115,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button v-if="formName != 3" type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/basic/corpMaintain/certDetail.vue

@@ -115,8 +115,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button v-if="formName != 3" type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/basic/corpMaintain/corpMaintain.vue

@@ -458,7 +458,7 @@
         :title="formAuthName"
         :visible.sync="orderMutiSetAuthVisible"
         :before-close="close"
-        width="60%"
+        width="85%"
         v-if="orderMutiSetAuthVisible"
         @close='closeAuthDialog'
         :close-on-click-modal="false"

src/views/basic/manu/ylqxzczhManuDialog.vue

@@ -116,8 +116,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button v-if="formName != 3" type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/basic/pilot/companyPilotDialog.vue

@@ -106,8 +106,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/basic/product/rel/certDetail.vue

@@ -115,8 +115,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button v-if="formName != 3" type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/purchase/cert/supCertType.vue

@@ -227,8 +227,8 @@ export default {
       list: [],
       formName: 1,
       formMap: {
-        1: "新增正式类型",
+        1: "新增证书类型",
-        2: "编辑正式类型",
+        2: "编辑证书类型",
       },
       inputQuery:{},
       orderMutiSetVisible: false,

src/views/purchase/cert/supCertTypeDialog.vue

@@ -106,8 +106,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/stat/orderDetailDialog.vue

@@ -118,8 +118,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/stat/orderDialog.vue

@@ -123,8 +123,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/stat/setDetailDialog.vue

@@ -114,8 +114,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/system/jar/jarVersionDialog.vue

@@ -131,8 +131,8 @@
           </el-row>
         </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button  @click="closeDialog">取消</el-button>
           <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-card>

src/views/system/user/authUser.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form :inline="true" :model="query" size="mini"  v-show="showSearch">
+      <el-form :inline="true" :model="query" label-width="120px" size="mini"  v-show="showSearch">
         <el-row>
             <el-form-item label="用户账号:">
               <el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>