BUG处理

src/views/CompanyUserService/index.vue

@@ -60,6 +60,16 @@
               <el-form-item label="学历：">{{ getFormobjAttribute('education') }}</el-form-item>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="手机：">{{ getFormobjAttribute('phone') }}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="邮箱：">{{ getFormobjAttribute('email') }}</el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col :span="12">
               <el-form-item label="服务方向：">{{ getFormobjAttribute('servicesAvailable') }}</el-form-item>

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -338,8 +338,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -349,8 +349,8 @@ export default {
         gdzctz: [
           { required: true, message: "固定资产投资不能为空", trigger: "blur" },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -369,24 +369,24 @@ export default {
         jckzz: [
           { required: true, message: "进、出口总值不能为空", trigger: "blur" },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
         jkzz: [
           { required: true, message: "进口总值不能为空", trigger: "blur" },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
         ckzz: [
           { required: true, message: "出口总值不能为空", trigger: "blur" },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -397,8 +397,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -409,8 +409,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -421,24 +421,24 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
         hgss: [
           { required: true, message: "海关税收不能为空", trigger: "blur" },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
         swbmss: [
           { required: true, message: "税务部门税收不能为空", trigger: "blur" },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -456,8 +456,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -468,8 +468,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -480,8 +480,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -492,8 +492,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],
@@ -504,8 +504,8 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
-            message: "不能为负数",
+            pattern: /^[+-]?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/,
+            message: "数值需为整数 或 负数 或 小数",
             trigger: "blur"
           }
         ],

src/views/IMPORTANTPROJECT/index.vue

@@ -90,12 +90,12 @@
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.xmmc"/>
         </template> -->
       </el-table-column>
-      <el-table-column label="建设单位 " align="center" prop="jsdw">
+      <el-table-column label="建设单位 " align="center" prop="jsdw_dictText">
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.jsdw"/>
         </template> -->
       </el-table-column>
-      <el-table-column label="承建单位 " align="center" prop="cjdw">
+      <el-table-column label="承建单位 " align="center" prop="cjdw_dictText">
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.cjdw"/>
         </template> -->
@@ -129,26 +129,26 @@
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.ndtzwcbfb"/>
         </template> -->
       </el-table-column>
+      <!-- <el-table-column label="创建人" align="center" prop="createBy_dictText">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createBy"/>
+        </template>
+      </el-table-column> -->
       <el-table-column label="创建时间" align="center" prop="createTime">
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createTime"/>
         </template> -->
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createBy"/>
-        </template> -->
-      </el-table-column>
+      <!-- <el-table-column label="修改人" align="center" prop="updateBy_dictText">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>
+        </template>
+      </el-table-column> -->
       <el-table-column label="修改时间" align="center" prop="updateTime">
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateTime"/>
         </template> -->
       </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updateBy">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>
-        </template> -->
-      </el-table-column>
       <!-- <el-table-column label="部门主键" align="center" prop="deptId"> -->
       <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>

src/views/QUESTION/edit.vue

@@ -55,7 +55,7 @@
         </el-select>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer" style="display: flex; justify-content: center;">
       <el-button type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="$layer.close(layerid)">取 消</el-button>
     </div>

src/views/QUESTION/index.vue

@@ -130,8 +130,8 @@
       </el-table-column> -->
       <el-table-column label="评价状态" align="center" prop="status">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status == 0">未回复</el-tag>
-          <el-tag v-else-if="scope.row.status == 1" type="success"
+          <!-- <el-tag v-if="scope.row.status == 0">未回复</el-tag> -->
+          <el-tag v-if="scope.row.status == 1" type="success"
             >已回复</el-tag
           >
         </template>
@@ -159,15 +159,15 @@
       </el-table-column>
       <el-table-column label="评价" align="center" prop="judge">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.judge == 0">未评价</el-tag>
-          <el-tag v-else-if="scope.row.judge == 1" type="success">好评</el-tag>
+          <!-- <el-tag v-if="scope.row.judge == 0">未评价</el-tag> -->
+          <el-tag v-if="scope.row.judge == 1" type="success">好评</el-tag>
           <el-tag v-else-if="scope.row.judge == 2" type="warning">中评</el-tag>
           <el-tag v-else-if="scope.row.judge == 3" type="danger">差评</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="回复时间" align="center" prop="responseTime">
+      <el-table-column label="回复时间" align="center" prop="replyTime">
         <template slot-scope="scope">
-          {{ scope.row.responseTime }}
+          {{ scope.row.replyTime }}
         </template>
       </el-table-column>
 

src/views/RANK/index.vue

@@ -292,6 +292,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptId = '';
+      this.queryParams.year = '';
+
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/norm/quotaBonded.vue

@@ -168,7 +168,7 @@
               <el-form-item v-if="dict.confirmWay == '附件'" label-width="70px" prop="linkUrls" label="上传附件">
                 <el-upload :on-exceed="exceedHandle" :limit="1" :disabled="isAppoval && (dict.isF == undefined ? true : false)" class="upload-demo" ref="upload"
                   :headers="upload.headers" :action="upload.url" :on-success="handleFileSuccess.bind(null, index)"
-                  :auto-upload="true" :file-list="dict.fileList" :on-remove="handleRemove" :on-change="handleChange">
+                  :auto-upload="true" :file-list="dict.fileList" :on-remove="handleRemove" :on-change="handleChange" on->
                   <el-button :disabled="isAppoval && (dict.isF == undefined ? true : false)" slot="trigger" size="small" type="primary">选取文件</el-button>
                 </el-upload>
               </el-form-item>
@@ -546,21 +546,23 @@ export default {
 
     // 文件上传成功处理
     handleFileSuccess(index, response, file, fileList) {
-      let linkUrls = "";
-      let fileNames = "";
+      let linkUrls = [];
+      let fileNames = [];
       fileList.forEach((item) => {
-        linkUrls += item.response.fileName + ",";
-        fileNames += item.response.newFileName + ",";
+        linkUrls.push(item.response.fileName );
+        fileNames.push(item.response.newFileName);
       });
       this.QUOTAFEEList.forEach((item, key) => {
         if (key == index) {
-          item.linkUrls = linkUrls;
-          item.fileNames = fileNames;
+          item.linkUrls = linkUrls.toString();
+          item.fileNames = fileNames.toString();
         }
       });
+      
     },
     /** 提交按钮 */
     async submitForm() {
+   
       this.form.bondedFeeList = this.QUOTAFEEList;
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -608,8 +610,8 @@ export default {
                           item.fileNames = res.newFileNames;
                         }
                       });
-                      //this.form.linkUrls = res.fileNames;
-                      //this.form.fileNames = res.newFileNames;
+                      this.form.linkUrls = res.fileNames;
+                      this.form.fileNames = res.newFileNames;
                       updateQUOTABONDED(this.form).then((response) => {
                         this.$modal.msgSuccess("修改成功");
                         this.open = false;
@@ -650,8 +652,8 @@ export default {
                         item.fileNames = res.newFileNames;
                       }
                     });
-                    //this.form.linkUrls = res.fileNames;
-                    //this.form.fileNames = res.newFileNames;
+                    this.form.linkUrls = res.fileNames;
+                    this.form.fileNames = res.newFileNames;
                     addQUOTABONDED(this.form).then((response) => {
                       this.$modal.msgSuccess("新增成功");
                       this.open = false;

src/views/system/notice/index.vue

@@ -156,7 +156,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="内容">
-              <editor v-model="form.noticeContent" :min-height="192"/>
+              <editor v-model="form.noticeContent" :min-height="50"/>
             </el-form-item>
           </el-col>
         </el-row>