Merge branch '1025branch' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into 1025branch

src/api/system/user.js

@@ -46,7 +46,6 @@ export function delUser(userId) {
 
 // 用户密码重置
 export function resetUserPwd(userId, password, is) {
-  console.log(is);
   const data = {
     userId,
     password,

src/components/Crontab/index.vue

@@ -182,7 +182,6 @@ export default {
       "updateCrontabValue", name, value, from;
       this.crontabValueObj[name] = value;
       if (from && from !== name) {
-        console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
         this.changeRadio(name, value);
       }
     },

src/components/DataAcquisition/index.vue

@@ -160,7 +160,6 @@ export default {
         inputType: "textarea",
       })
         .then(({ value }) => {
-          // console.log(666,value);
           this.handleCheck(2, value);
           // this.$message({
           //   type: 'success',
@@ -201,7 +200,6 @@ export default {
         }
       }
     }
-    console.log(this.tabList);
   },
 };
 </script>

src/components/selectTree/index.vue

@@ -74,7 +74,6 @@ export default {
         }
     },
     // created() {
-    //     console.log('this.param', this.param);
     //     this.param.length > 0 && (this.dataList = this.handleTree(this.param, this.formatId));
     // },
     methods: {

src/layout/components/Navbar.vue

@@ -187,7 +187,6 @@ export default {
     getUserInfo() {
       getInfo().then((res) => {
         this.userData = res.user;
-        console.log(res.user);
         if (res.user.type == true) this.open = true;
       });
     },

src/utils/dict/DictOptions.js

@@ -8,7 +8,6 @@ export const options = {
        * 字典请求，方法签名为function(dictMeta: DictMeta): Promise
        */
       request: (dictMeta) => {
-        console.log(`load dict ${dictMeta.type}`)
         return Promise.resolve([])
       },
       /**

src/utils/request.js

@@ -89,13 +89,11 @@ service.interceptors.request.use(config => {
   // 请求参数加密
   if (process.env.VUE_APP_AES_ENCRYPT_ENABLED == 'true') {
     if (config.data) {
-      console.log(JSON.stringify(config.data));
       config.data = {
         // 加密参数
         dataParams: encodeURIComponent(aes.encrypt(JSON.stringify(config.data)))
       }
     } else if (config.params) {
-      console.log(JSON.stringify(config.params));
       config.params = {
         // 加密参数
         dataParams: encodeURIComponent(aes.encrypt(JSON.stringify(config.params)))
@@ -132,7 +130,6 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-  console.log(error)
   Promise.reject(error)
 })
 
@@ -188,7 +185,6 @@ service.interceptors.response.use(res => {
   }
 },
   error => {
-    console.log('err' + error)
     setTimeout(() => {
       Vue.prototype.$layer.closeAll('loading');
     }, 500);

src/views/APICONFIG/index.vue

@@ -535,7 +535,6 @@ export default {
       this.reset();
     },
     getCurrentRow(val) {
-      console.log(val);
     },
     // 表单重置
     reset() {

src/views/ARTICLE/edit.vue

@@ -178,7 +178,6 @@ export default {
         if (valid) {
           this.form.status = type;
           if (this.form.id != null) {
-            // console.log("修改内容");
             updateARTICLE(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.$layer.close(this.layerid);
@@ -186,7 +185,6 @@ export default {
             });
           } else {
             if (type == 0) {
-              // console.log("草稿保存");
               addARTICLE(this.form).then((response) => {
                 this.$modal.msgSuccess("保存成功");
                 this.$layer.close(this.layerid);
@@ -194,7 +192,6 @@ export default {
               });
             } 
             if (type == 1) {
-              // console.log("提交审核");
               addARTICLE(this.form).then((response) => {
                 this.$modal.msgSuccess("提交审核成功");
                 this.$layer.close(this.layerid);

src/views/ARTICLE/enterData.vue

@@ -52,7 +52,6 @@ export default {
     },
   },
   created() {
-    // console.log(this.param.param);
   },
   data() {
     return {

src/views/ARTICLE/task/index.vue

@@ -83,7 +83,6 @@ export default {
   },
   props: ["taskList"],
   created() {
-    console.log(this.taskList);
   },
   methods: {},
 };

src/views/AttendMeeting/index.vue

@@ -259,7 +259,6 @@ export default {
   },
   created() {
     getInfo().then((res) => {
-      // console.log(res);
       this.meetId = res.user.deptId;
       this.queryParams.deptIds = this.meetId;
       this.getList();

src/views/AuxiliaryIndex/index.vue

@@ -322,7 +322,6 @@ export default {
     tableBdClick(data) {
       this.queryParams.id = data.senId;
       listNORMROLE(this.pageParams).then((res) => {
-        console.log(res);
       });
     },
 

src/views/BONDEDUPPLY/index.vue

@@ -446,7 +446,6 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
-      console.log(this.ids);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -458,14 +457,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row.lddwmc);
       this.reset();
       let lddwmc = row.id || this.ids;
       getBONDEDUPPLY(lddwmc).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改保税区供应链数据";
-        console.log(this.form, "form");
       });
     },
     /** 提交按钮 */
@@ -504,7 +501,6 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const lddwmcs = row.id || this.ids;
-      console.log(lddwmcs);
       this.$modal
         .confirm(
           '是否确认删除保税区供应链数据编号为"' + lddwmcs + '"的数据项？'

src/views/COMPANYUSER/index.vue

@@ -546,7 +546,6 @@ export default {
     this.getList();
     getMark().then((res) => {
       this.markList = res.data;
-      console.log(res);
     });
   },
   methods: {

src/views/GATHER/index.vue

@@ -813,7 +813,6 @@ export default {
     this.getList();
     this.bondedList();
     // getInfo().then((res) => {
-    //   console.log(res);
     //   //  this.data = res;
     // });
   },
@@ -903,7 +902,6 @@ export default {
     },
     httprequest() {},
     getCurrentRow(val) {
-      console.log(val);
     },
     // 获取保税区列表
     bondedList() {
@@ -1059,7 +1057,6 @@ export default {
         inputType: "textarea",
       })
         .then(({ value }) => {
-          // console.log(666,value);
           this.handleCheck(2, value);
           // this.$message({
           //   type: 'success',
@@ -1079,7 +1076,6 @@ export default {
     getList() {
       this.loading = true;
       listGATHER(this.queryParams).then((response) => {
-        console.log("response", response);
         this.GATHERList = response.rows;
         this.load = false;
         this.total = response.total;
@@ -1143,7 +1139,6 @@ export default {
       this.form = [];
       const id = row.id || this.ids;
       getInfoByColl(id).then((response) => {
-        console.log(response.data.feeLists);
         //深拷贝，而不是拷贝地址
         this.form = JSON.parse(JSON.stringify(response.data));
         this.open = true;
@@ -1175,7 +1170,6 @@ export default {
         //   ])
         // }
 
-        // console.log(this.rules);
 
         //这里是第二种写法
         //获取分类ID相同的子集
@@ -1246,7 +1240,6 @@ export default {
         //   ])
         // }
 
-        // console.log(this.rules);
 
         //这里是第二种写法
         //获取分类ID相同的子集

src/views/JOINTCONFERENCE/add.vue

@@ -242,7 +242,6 @@ export default {
     },
 
     handleChange(val) {
-      console.log(typeof val);
     },
     /** 提交按钮 */
     submitForm() {
@@ -256,7 +255,6 @@ export default {
           }
           if (this.user.type == 1 && this.user.deptId == 100)
             cooperativeUnitId.push(100);
-          console.log(cooperativeUnitId);
 
           if (this.form.id != null) {
             this.form.deptNum = 1;

src/views/JOINTCONFERENCE/callback.vue

@@ -134,7 +134,6 @@ export default {
     if (this.param.id) {
       getAttendMeetingDetail(this.param.id).then((response) => {
         this.form = response.data;
-        console.log(this.form);
       });
     }
   },

src/views/JOINTCONFERENCE/detail.vue

@@ -183,7 +183,6 @@ export default {
   },
   methods: {
     downloadFile(item, index) {
-      console.log(item);
       let path = this.imgList[index].replace("/profile", "");
       let name = this.imgList[index].replace("/profile/upload/", "");
       fileDownloadFun({ fileName: path, delete: false }).then((res) => {

src/views/RightDistribution/index.vue

@@ -310,7 +310,6 @@ export default {
     tableBdClick(data) {
       this.queryParams.id = data.senId;
       listNORMROLE(this.pageParams).then((res) => {
-        console.log(res);
       });
     },
 
@@ -388,7 +387,6 @@ export default {
       const id = row.id || this.ids;
       getNORMROLE(id).then((response) => {
         this.form = response.data;
-        console.log(typeof this.form.senId);
         this.open = true;
         this.title = "修改指标采集权限配置";
       });

src/views/TOTEXP/index.vue

@@ -406,7 +406,6 @@ export default {
     },
     // 部门选择器
     formDeptSelect() {
-      console.log('部门id', this.form.deptId)
       // 寻找deptId 对应的部门
       let dept = this.deptList.filter(item => item.deptId === this.form.deptId)[0]
       // 根据部门 的 type 赋值给level
@@ -469,7 +468,6 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
-        console.log(valid);
         if (valid) {
           if (this.form.id != null) {
             updateTOTEXP(this.form).then((response) => {

src/views/TQSJ/index.vue

@@ -64,7 +64,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table :data="dataList" height="500px">
+    <el-table :data="dataList" height="500px" :span-method="objectSpanMethod" >
       <el-table-column label="保税区名称" align="center" prop="cbName" width="150px">
         <template slot-scope="scope">
           {{ scope.row.cbName }}
@@ -245,7 +245,8 @@ export default {
       }
       getTQSJ(this.queryParams).then(response => {
         this.dataList = []
-        this.dataList = response.data;
+        // 对字符串数据统一进行排序
+        this.dataList = response.data.sort((a, b) => a.cbName.localeCompare(b.cbName));
         if(this.dataList){
           for (const i in this.dataList[0].datails) {
             this.timeValue.push(this.dataList[0].datails[i].timeValue)
@@ -280,6 +281,31 @@ export default {
     handleQuery() {
       this.getList();
     },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }){
+        //列合并
+        if(columnIndex === 0) { // 只合并第一行
+          if(this.dataList.filter(({ cbName }) => cbName == row.cbName).length > 1 ) { // 只合并相同名字下行数大于1的（废话，不然没有合并的必要）
+            if(rowIndex == this.dataList.findIndex(({cbName}) => cbName == row.cbName )) { // 找到第一个同名的索引，从第一个开始合并，其他隐藏）
+                return { // 合并长度就是数组的长度  宽度是表头的宽度
+                  rowspan: this.dataList.filter(({ cbName }) => cbName == row.cbName).length,
+                  colspan: column.colSpan
+              }
+            }else { // 只保留第一行其他的隐藏
+              return {
+                rowspan: 0,
+                colspan: 0
+              }
+            }
+            
+          }else {
+            return {
+                rowspan: 1,
+                colspan: 1
+              }
+          }
+        }
+
+      },
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.cbIdArr = [];

src/views/ZBCS/index.vue

@@ -143,7 +143,6 @@ export default {
       this.ChartData =[]
       getZBCS(this.queryParams).then(response => {
         this.dataList = response.data;
-        console.log(this.dataList);
         for (const i in response.data) {
           this.ChartData.push({ 
             name: response.data[i].colName,

src/views/dashboard/circleChart.vue

@@ -66,7 +66,6 @@ export default {
       }, 300);
     },
     setOptions(chartData) {
-      console.log(chartData);
       let seriesData = [];
       if (chartData) {
         chartData.forEach((item, index) => {

src/views/login.vue

@@ -50,8 +50,8 @@ export default {
     return {
       codeUrl: '',
       loginForm: {
-        username: 'admin',
-        password: 'admin123',
+        username: '',
+        password: '',
         rememberMe: false,
         code: '',
         uuid: ''

src/views/news/edit.vue

@@ -68,7 +68,6 @@ export default {
     }
   },
   mounted() {
-    console.log('asd:' + this.param.type);
     if (this.param.type) {
       this.form.type =parseInt(this.param.type);
     }

src/views/news/task/index.vue

@@ -130,7 +130,6 @@ export default {
       });
       // downloadpic(this.taskList.formobj.picture).then((res) => {
 
-      //   console.log('下载转换后:',this.fileList[0])
       // });
     }
     //this.taskList.form.content = this.taskList.form.content.replace(new RegExp('/profile/upload/', 'g'), this.baseUrl + '/profile/upload/');

src/views/norm/feeindex.vue

@@ -428,9 +428,7 @@ export default {
     },
     dataFormulaHandler(data) {
       this.isShowFormulaDialog = false;
-      console.log("dataHandler111",data)
       this.queryParams.normId = data;
-      console.log("11111111111",this.queryParams)
       listNORMFEE(this.queryParams).then((response) => {
         response.rows.forEach((item, index) => {
           response.rows[index].status = item.status == 0 ? false : true;
@@ -442,7 +440,6 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.normId = this.normId;
-      console.log("11111111111",this.queryParams)
       listNORMFEE(this.queryParams).then((response) => {
         response.rows.forEach((item, index) => {
           response.rows[index].status = item.status == 0 ? false : true;

src/views/norm/index.vue

@@ -229,7 +229,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       const id = row.id || this.ids;
       getNORM(id).then(response => {

src/views/norm/quota.vue

@@ -209,7 +209,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       const id = row.id || this.ids;
       getQUOTA(id).then(response => {

src/views/norm/quotaBonded.vue

@@ -231,10 +231,10 @@
         </el-tab-pane>
 
       </el-tabs>
-
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="!isAppoval" @click="submitForm">确 定</el-button>
-        <el-button type="primary" v-if="user.roleId == 10" @click="submitForm">确 定</el-button>
+       
+        <el-button type="primary" v-if="(!isAppoval) || (user.roleId == 10)" @click="submitForm">确 定</el-button>
+        <!-- <el-button type="primary" v-if="user.roleId == 10" @click="submitForm">确 定</el-button> -->
 
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -769,8 +769,6 @@ export default {
         if (data.length != 0) {
           this.QUOTAFEEList.unshift(...data);
         }
-        console.log(data);
-        console.log(this.QUOTAFEEList[0].quotaName);
 
 
         this.tabList = JSON.parse(JSON.stringify(response.data.bondedFeeList));

src/views/system/dept/index.vue

@@ -386,10 +386,12 @@ export default {
     // 文件上传选择
     handleSelect(file, list) {
       this.fileList = list;
+      this.$nextTick(() => {
+        this.$refs["upload"].submit();
+      })
     },
     // 文件移除
     handleRemove(file, fileList) {
-      console.log(file, fileList);
     },
     // 文件上传成功
     handleSuccess(response, file, fileList) {
@@ -401,7 +403,11 @@ export default {
       });
       this.form.sinfo03 = imgList.toString();
 
-      this.$refs["form"].validate((valid) => {
+      // this.submitData()
+    },
+    submitData() {
+      return new Promise((resolve, reject) => {
+        this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.deptId != undefined) {
             updateDept(this.form).then((response) => {
@@ -416,19 +422,22 @@ export default {
               this.getList();
             });
           }
+          resolve()
+        }else {
+          reject()
         }
       });
+      })
+      
     },
-    handlePreview(file) {
-      console.log(file);
-    },
+    // handlePreview(file) {
+    // },
     // 文件上传之前
     handleBeforeUpload(file) {
       // 截取上传文件的后缀名
       let fileType = file.name.substring(file.name.lastIndexOf(".") + 1);
       // 判断文件名的类型，允许多种就判断多个
       if (fileType == "jpg" || fileType == "png") {
-        console.log(file, "jpg || png");
       } else {
         this.$message.error("文件类型必须为 jpg / png 格式");
         // 返回false 就不会执行上传操作了
@@ -532,7 +541,8 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
-      this.$refs["upload"].submit();
+        
+      this.submitData()
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/task/index.vue

@@ -255,7 +255,6 @@ export default {
   methods: {
     checkPermi,
     closeDia() {
-      // console.log('关闭');
     },
     extask() {
       this.$refs["extaskform"].validate((valid) => {
@@ -308,7 +307,6 @@ export default {
     //     this.componentUrl = res.data.infoUrl;
     //     downloadpic(res.data.formobj.picture).then((res) => {
     //       this.taskList.formobj.picture = window.URL.createObjectURL(res);
-    //       console.log('下载转换后:',this.taskList.formobj.picture)
     //       this.dialogVisible = true;
     //     });
     //   });
@@ -340,7 +338,6 @@ export default {
     handleExamine(row) {
       // this.taskList = []
       getINSTACTIONTASK(row.id).then((res) => {
-        console.log('111111', res);
         this.taskList = res.data;
         this.componentUrl = res.data.infoUrl;
         this.dialogVisible = true;
@@ -349,7 +346,6 @@ export default {
     //点击查看详细
     handleDetail(row) {
       getINSTACTIONTASK(row.id).then((res) => {
-        console.log('666', res);
         this.taskList = res.data;
         this.componentUrl = res.data.infoUrl;
         downloadpic(this.taskList.formobj.picture).then((res) => {