Forráskód Böngészése

提交禅道修复问题

刘湘琪 3 éve%!(EXTRA string=óta)
szülő
commit
18ded91a88

+ 5 - 30
src/views/common/registerFirst.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form" label-width="190px">
-      <h3 class="title">注册信息</h3>
-      <el-collapse v-model="activeName">
+      <h3 class="title">企业注册</h3>
+      <el-collapse v-model="activeNames">
         <template v-if="tokenVisile">
           <el-collapse-item title="账户信息" name="1">
             <el-row :gutter="40">
@@ -315,11 +315,6 @@
             </el-col>
           </el-row>
         </el-collapse-item>
-        <el-collapse-item title="服务时间" name="12">
-          <el-form-item label="服务时间段" prop="serviceDate">
-            <el-date-picker v-model="registerForm.serviceDate" placeholder="选择日期" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-        </el-collapse-item>
       </el-collapse>
       <el-row :gutter="40">
         <el-col :span="24">
@@ -388,7 +383,7 @@ export default {
       },
       dialogVisible: false,
       dialogImageUrl: "",
-      activeName: '1',
+      activeNames: ['1','2','3','4','5','6','7','8','9','10','11'],
       provinceName: '',
       attachType: 'ENT',
       dataId: '',
@@ -404,7 +399,6 @@ export default {
       cityDataList: [],
       districtDataList: [],
       registerForm: {
-        serviceDate: [],
         startDate: '',
         endDate: '',
         attachIds: [],
@@ -553,9 +547,6 @@ export default {
         ],
         logo: [
           { required: true, trigger: "change", message: "请上传文件水印" },
-        ],
-        serviceDate: [
-          { type: 'array', required: true, message: '请选择服务时间', trigger: 'change' }
         ]
       },
       loading: false,
@@ -592,11 +583,6 @@ export default {
         }
         let mainProductArray = this.registerForm.mainProducts.split(',') || ['电子信息'];
         this.$set(this.registerForm, 'mainProductArray', mainProductArray);
-        this.registerForm.serviceDate = []
-        if(this.registerForm.startDate) {
-          this.registerForm.serviceDate[0] = this.registerForm.startDate
-          this.registerForm.serviceDate[1] = this.registerForm.endDate
-        }
         this.registerForm.provinceId = res.data.provinceId
         if(this.registerForm.provinceId) {
           getRegionChildrenApi(this.registerForm.provinceId).then(res => {
@@ -762,18 +748,6 @@ export default {
         }
       });
     }
-  },
-  watch: {
-    'registerForm.serviceDate'(val) {
-      if(this.registerForm.serviceDate.length > 0) {
-        console.log("!!!!!!!!!!!!!!")
-        this.registerForm.startDate = this.registerForm.serviceDate[0]
-        this.registerForm.endDate = this.registerForm.serviceDate[1]
-      }else {
-        this.registerForm.startDate = ''
-        this.registerForm.endDate = ''
-      }
-    }
   }
 };
 </script>
@@ -793,7 +767,8 @@ export default {
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
-  color: #707070;
+  color: #707070;
+  font-weight: bold;
 }
 
 .register-form {

+ 4 - 1
src/views/enterprise/declare/components/EnclosureInfo.vue

@@ -3,7 +3,7 @@
     <h3 class="toolbar">
       <div class="tool">
         <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownloadBatch">批量下载</el-button>
-        <el-button type="primary" plain icon="el-icon-download" size="mini">一键打印</el-button>
+        <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handlePrint">一键打印</el-button>
       </div>
     </h3>
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange" style="width: 100%" @select-all="selectAll">
@@ -130,6 +130,9 @@
           this.ids = ''
         }
       },
+      handlePrint() {
+        
+      },
       handleDownloadBatch() {
         if(this.selectionList.length <=0) {
           this.$message.error('请选择要下载的数据');

+ 1 - 1
src/views/enterprise/project/components/TechEnclosure.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <h3 class="toolbar">
       <div class="tool">
-        <el-button type="primary" plain icon="el-icon-upload2" size="mini" @click="handleUpload" v-if="userType == 'ENT_TECH' || userType == 'ENT_ADMIN_TECH'">一键上传</el-button>
+        <el-button type="primary" plain icon="el-icon-upload2" size="mini" @click="handleUpload" v-if="userType == 'ENT_TECH' || userType == 'ENT_ADMIN_TECH'" v-hasRole="['ENT_ADMIN_TECH','ENT_TECH']">一键上传</el-button>
         <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownload">批量下载</el-button>
         <el-button type="primary" plain icon="el-icon-delete" size="mini" @click="handleBatchDelte" v-if="userType == 'ENT_TECH' || userType == 'ENT_ADMIN_TECH'">批量删除</el-button>
       </div>