From 275523fa188d164eb64979f4d35de25a41294bf7 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 6 Jul 2023 10:59:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=B0=B8=E4=B9=85?=
 =?UTF-8?q?=E6=9C=89=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/cert/userCertAddDialog.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/purchase/cert/userCertAddDialog.vue b/src/views/purchase/cert/userCertAddDialog.vue
index 0e07613..fb4088a 100644
--- a/src/views/purchase/cert/userCertAddDialog.vue
+++ b/src/views/purchase/cert/userCertAddDialog.vue
@@ -58,7 +58,6 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="expireDate">
-
               <el-date-picker
                 v-model="formData.expireDate"
                 type="date"
@@ -67,9 +66,19 @@
                 style="width: 100%"
                 placeholder="请选择失效期">
               </el-date-picker>
-
             </el-form-item>
           </el-col>
+          <el-col :span="1">
+            <el-radio-group v-model="formData.expireDate">
+              <el-radio-button
+                v-model="formData.expireDate"
+                label="2999-01-01"
+                type="date"
+                value-format="yyyy-MM-dd"
+                :disabled="this.formData.expireDate != null || formData.auditStatus == 1"
+              >永久有效</el-radio-button>
+            </el-radio-group>
+          </el-col>
         </el-row>
 
 
@@ -85,7 +94,6 @@
             </el-form-item>
           </el-col>
 
-
         </el-row>
 
 
@@ -250,7 +258,6 @@ export default {
     },
 
     submitUpload(){
-      debugger
       if(this.editTye == 1){
         this.onConfirmSubmit();
       }else{
@@ -274,7 +281,6 @@ export default {
     updateCert(){
       updateCert(this.formData).then((res)=>{
         if(res.code == 20000){
-          debugger
           this.$message.success("修改成功!")
           this.closeDialog();
         }else{

From 10e7f3d5308cd23c0b411836426a6447cd03f759 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 7 Jul 2023 10:33:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/improveInfo.vue | 102 +++++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 45 deletions(-)

diff --git a/src/views/improveInfo.vue b/src/views/improveInfo.vue
index 5a016fe..9cd3e8f 100644
--- a/src/views/improveInfo.vue
+++ b/src/views/improveInfo.vue
@@ -19,9 +19,10 @@
       ref="inputQuery"
       label-width="150px"
     >
+
       <el-card class="el-card">
         <div slot="header" class="clearfix">
-          <span>本企业信息:</span>
+          <span>审核信息:</span>
           <div>
             <div style="float: right;margin-top: -20px ">
               <el-button
@@ -44,27 +45,6 @@
             </div>
           </div>
         </div>
-<!--        <el-row-->
-<!--          :gutter="20"-->
-<!--          class="el-row"-->
-<!--          type="flex"-->
-<!--        >-->
-<!--          <el-col :span="15" class="el-col">-->
-
-<!--            <el-form-item-->
-<!--              label="本企业信息审核状态:"-->
-<!--              prop="reason"-->
-<!--            >-->
-<!--               <span>-->
-<!--           <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
-<!--             {{ checkSupFlag[inputQuery.ucstatus] }}-->
-<!--              </el-tag>-->
-<!--          </span>-->
-<!--            </el-form-item>-->
-
-
-<!--          </el-col>-->
-<!--        </el-row>-->
         <el-row
           :gutter="20"
           class="el-row"
@@ -86,26 +66,54 @@
 
           </el-col>
         </el-row>
+        <el-row
+          :gutter="20"
+          class="el-row"
+          type="flex"
+        >
+          <el-col :span="15" class="el-col">
+            <el-form-item
+              label="审核说明:"
+              prop="reason"
+            >
+              <el-input
+                size="small"
+                disabled
+                v-model="inputQuery.reason"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+
+        </el-row>
+      </el-card>
+      <el-card class="el-card">
+        <div slot="header" class="clearfix">
+          <span>本企业信息:</span>
+
+        </div>
 <!--        <el-row-->
 <!--          :gutter="20"-->
 <!--          class="el-row"-->
 <!--          type="flex"-->
 <!--        >-->
 <!--          <el-col :span="15" class="el-col">-->
+
 <!--            <el-form-item-->
-<!--              label="审核说明:"-->
+<!--              label="本企业信息审核状态:"-->
 <!--              prop="reason"-->
 <!--            >-->
-<!--              <el-input-->
-<!--                size="small"-->
-<!--                disabled-->
-<!--                v-model="inputQuery.reason"-->
-<!--              ></el-input>-->
+<!--               <span>-->
+<!--           <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
+<!--             {{ checkSupFlag[inputQuery.ucstatus] }}-->
+<!--              </el-tag>-->
+<!--          </span>-->
 <!--            </el-form-item>-->
-<!--          </el-col>-->
 
 
+<!--          </el-col>-->
 <!--        </el-row>-->
+
         <el-row
           :gutter="20"
           class="el-row"
@@ -322,7 +330,7 @@
 
         <div slot="header" class="clearfix">
           <span>
-            系统负责人信息
+            系统负责人信息:
           </span>
         </div>
 
@@ -440,7 +448,7 @@
       <el-card>
         <div slot="header" class="clearfix">
           <span>
-            资质证书信息
+            资质证书信息:
           </span>
 
         <div style="float: right; text-align: right; margin-bottom: 8px">
@@ -472,30 +480,30 @@
           <el-table-column label="证书编号" prop="code" ></el-table-column>
           <el-table-column label="生效日期" prop="validDate"></el-table-column>
           <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-          <el-table-column label="确认状态" prop="checkStatus" width="120">
+          <el-table-column label="确认状态" prop="checkStatus" width="80">
             <template slot-scope="scope">
               <el-tag :type="scope.row.checkStatus | statusFilterType">
                 {{ checkFlag[scope.row.checkStatus] }}
               </el-tag>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            label="确认说明"-->
-<!--            prop="checkComment"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-          <el-table-column label="状态说明" prop="status" width="120">
-            <template slot-scope="scope">
-              <el-tag :type="scope.row.status | statusFilterType">
-                {{ statusFlag[scope.row.status] }}
-              </el-tag>
+          <el-table-column
+            label="确认说明"
+            prop="checkComment"
+            show-overflow-tooltip
+          ></el-table-column>
+<!--          <el-table-column label="状态说明" prop="status" width="120">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-tag :type="scope.row.status | statusFilterType">-->
+<!--                {{ statusFlag[scope.row.status] }}-->
+<!--              </el-tag>-->
 
-            </template>
-          </el-table-column>
+<!--            </template>-->
+<!--          </el-table-column>-->
 
           <el-table-column label="备注" prop="remark"></el-table-column>
 
-          <el-table-column label="操作" width="180">
+          <el-table-column label="操作" width="140">
             <template slot-scope="scope">
               <el-button
                 type="text"
@@ -1019,4 +1027,8 @@ export default {
   margin: auto;
 
 }
+.el-form-item{
+  margin-top: 5px;
+  margin-bottom: 4px;
+}
 </style>

From 9b2ed727faa022c588114b24a61588986ec78c49 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Fri, 7 Jul 2023 15:35:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/cert/supCertSet.vue | 184 ++++++++++++-------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/views/purchase/cert/supCertSet.vue b/src/views/purchase/cert/supCertSet.vue
index 94f9434..0e88a74 100644
--- a/src/views/purchase/cert/supCertSet.vue
+++ b/src/views/purchase/cert/supCertSet.vue
@@ -1,97 +1,97 @@
 <template>
     <div>
-        <el-card>
-            <div>
-                <p class="form-title">配送企业资质设置</p>
-            </div>
-            <div style=" float: right; text-align: right; margin-bottom: 8px;">
-                <el-button type="primary" size="mini" icon="search" @click="addCert" style="text-align:right">添加设置</el-button>
-            </div>
-            <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row>
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="证书名称" prop="name"></el-table-column>
-                <el-table-column label="是否必传" prop="require" s>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.need] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="说明" prop="remark"></el-table-column>
-                <el-table-column label="操作"  width="200">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click="handleEdit(scope.row)"
-                        >编辑
-                        </el-button>
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click="handleDel( scope.row)"
-                        >删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="query.page"
-            :limit.sync="query.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
-
-            <el-dialog
-                :title="formMap[formName]"
-                :visible.sync="addDialogVisible"
-                width="60%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="addDialogVisible"
-            >
-
-                <el-form :model="currentSup" :rules="formRules" label-width="100px" ref="dataForm">
-                    <el-row>
-                        <el-col :span="11">
-                            <el-form-item  label="证书名称:" prop="name">
-                                <el-input v-model="currentSup.name"  style="width: 90%" auto-complete="off"></el-input>
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="11">
-                            <el-form-item label="是否必传:"  prop="need">
-                                <el-select style="width: 90%"  v-model="currentSup.need">
-                                    <el-option label="是" :value=true></el-option>
-                                    <el-option label="否" :value=false></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="22">
-                            <el-form-item label="说明:"  prop="remark">
-                                <el-input v-model="currentSup.remark" style="width: 95.5%" auto-complete="off" type="textarea"
-                                          autosize></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-
-            </el-dialog>
-
-        </el-card>
+<!--        <el-card>-->
+<!--            <div>-->
+<!--                <p class="form-title">配送企业资质设置</p>-->
+<!--            </div>-->
+<!--            <div style=" float: right; text-align: right; margin-bottom: 8px;">-->
+<!--                <el-button type="primary" size="mini" icon="search" @click="addCert" style="text-align:right">添加设置</el-button>-->
+<!--            </div>-->
+<!--            <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row>-->
+<!--                <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+<!--                <el-table-column label="证书名称" prop="name"></el-table-column>-->
+<!--                <el-table-column label="是否必传" prop="require" s>-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <span>{{ enableMap[scope.row.need] }}</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column label="说明" prop="remark"></el-table-column>-->
+<!--                <el-table-column label="操作"  width="200">-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <el-button-->
+<!--                            type="text"-->
+<!--                            size="small"-->
+<!--                            @click="handleEdit(scope.row)"-->
+<!--                        >编辑-->
+<!--                        </el-button>-->
+
+<!--                        <el-button-->
+<!--                            type="text"-->
+<!--                            size="small"-->
+<!--                            @click="handleDel( scope.row)"-->
+<!--                        >删除-->
+<!--                        </el-button>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+<!--            </el-table>-->
+
+<!--          <pagination-->
+<!--            v-show="total>0"-->
+<!--            :total="total"-->
+<!--            :page.sync="query.page"-->
+<!--            :limit.sync="query.limit"-->
+<!--            @pagination="handleCurrentChange"-->
+<!--          ></pagination>-->
+
+<!--            <el-dialog-->
+<!--                :title="formMap[formName]"-->
+<!--                :visible.sync="addDialogVisible"-->
+<!--                width="60%"-->
+<!--                :close-on-click-modal="false"-->
+<!--                :close-on-press-escape="false"-->
+<!--                v-if="addDialogVisible"-->
+<!--            >-->
+
+<!--                <el-form :model="currentSup" :rules="formRules" label-width="100px" ref="dataForm">-->
+<!--                    <el-row>-->
+<!--                        <el-col :span="11">-->
+<!--                            <el-form-item  label="证书名称:" prop="name">-->
+<!--                                <el-input v-model="currentSup.name"  style="width: 90%" auto-complete="off"></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+
+<!--                        <el-col :span="11">-->
+<!--                            <el-form-item label="是否必传:"  prop="need">-->
+<!--                                <el-select style="width: 90%"  v-model="currentSup.need">-->
+<!--                                    <el-option label="是" :value=true></el-option>-->
+<!--                                    <el-option label="否" :value=false></el-option>-->
+<!--                                </el-select>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                    </el-row>-->
+<!--                    <el-row>-->
+<!--                        <el-col :span="22">-->
+<!--                            <el-form-item label="说明:"  prop="remark">-->
+<!--                                <el-input v-model="currentSup.remark" style="width: 95.5%" auto-complete="off" type="textarea"-->
+<!--                                          autosize></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                    </el-row>-->
+<!--                </el-form>-->
+<!--                <div style="text-align: center">-->
+<!--                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"-->
+<!--                    >提交-->
+<!--                    </el-button-->
+<!--                    >-->
+<!--                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"-->
+<!--                    >取消-->
+<!--                    </el-button-->
+<!--                    >-->
+<!--                </div>-->
+
+<!--            </el-dialog>-->
+
+<!--        </el-card>-->
 
         <el-card>
             <div>