6.20bug

src/views/mbsys/collaborative/announcement/information/index.vue

@@ -595,7 +595,7 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      return data.folderName.indexOf(value) !== -1;
     },
     // 点击节点时
     nodeClick(data, node, self) {

src/views/mbsys/collaborative/documentmanage/mydocuments/index.vue

@@ -60,7 +60,7 @@
           >
             <el-form-item>
               <el-input
-                v-model="noticeForm.content"
+                v-model="noticeForm.theme"
                 size="small"
                 placeholder="请输入关键字"
                 style="width: 260px"
@@ -250,7 +250,7 @@
                   <div
                     class="file-name"
                     @click="downloadFile(file)"
-                    :style="optionType != 0? '' : 'width:100%;'"
+                    :style="optionType != 0 ? '' : 'width:100%;'"
                   >
                     {{ file.fileName }}
                   </div>
@@ -519,7 +519,7 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      return data.folderName.indexOf(value) !== -1;
     },
     // 点击节点时
     nodeClick(data, node, self) {
@@ -556,8 +556,8 @@ export default {
           documentType: this.noticeForm.documentType,
         });
       }
-      if (this.noticeForm.content != "")
-        Object.assign(param, { content: this.noticeForm.content });
+      if (this.noticeForm.theme != "")
+        Object.assign(param, { theme: this.noticeForm.theme });
       getNoticePage(param).then((res) => {
         if (res.code == 1) {
           let tableData = res.result.records;
@@ -626,7 +626,7 @@ export default {
     queryDetail(row) {
       this.newDialogVisible = true;
       this.optionType = 0;
-              this.existsFiles = [];
+      this.existsFiles = [];
       getNoticeById(row.id).then((res) => {
         if (res.code == 1) {
           let {

src/views/mbsys/collaborative/documentmanage/publicdocuments/index.vue

@@ -60,9 +60,9 @@
           >
             <el-form-item>
               <el-input
-                v-model="noticeForm.content"
+                v-model="noticeForm.theme"
                 size="small"
-                placeholder="请输入关键字"
+                placeholder="请输入文档全称"
                 style="width: 260px"
               ></el-input>
               <el-button
@@ -516,7 +516,7 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      return data.folderName.indexOf(value) !== -1;
     },
     // 点击节点时
     nodeClick(data, node, self) {
@@ -553,8 +553,8 @@ export default {
           documentType: this.noticeForm.documentType,
         });
       }
-      if (this.noticeForm.content != "")
-        Object.assign(param, { content: this.noticeForm.content });
+      if (this.noticeForm.theme != "")
+        Object.assign(param, { theme: this.noticeForm.theme });
       getNoticePage(param).then((res) => {
         if (res.code == 1) {
           let tableData = res.result.records;
@@ -614,7 +614,7 @@ export default {
     queryDetail(row) {
       this.newDialogVisible = true;
       this.optionType = 0;
-              this.existsFiles = [];
+      this.existsFiles = [];
       getNoticeById(row.id).then((res) => {
         if (res.code == 1) {
           let {

src/views/mbsys/collaborative/meetingmanage/meetingapplication/index.vue

@@ -444,13 +444,10 @@ export default {
       if (this.form.registerDept != "")
         Object.assign(map, { registerDept: this.form.registerDept });
       if (this.form.purchaseTime) {
-        Object.assign(
-          map,
-          {
-            stratTime: this.form.purchaseTime[0] + " 00:00:00",
-            endTime: this.form.purchaseTime[1]
-           + " 23:59:59"}
-        );
+        Object.assign(map, {
+          stratTime: this.form.purchaseTime[0] + " 00:00:00",
+          endTime: this.form.purchaseTime[1] + " 23:59:59",
+        });
       }
       getProcessList2(params, url).then((res) => {
         if (res.code == 1) {
@@ -623,16 +620,6 @@ export default {
         relationId: data.form.relationId, //会议地址
         tableId: 1, //会议地址
       });
-      // // 关联人员
-      // let staffDtos = [];
-      // let deptStaff = data.form.deptStaff;
-      // deptStaff.forEach((item, index) => {
-      //   staffDtos.push({
-      //     deptStaff: item, //参会人员
-      //     dept: data.form.superviseDept, //参会部门
-      //     staffType: 1, //参会人员类型
-      //   });
-      // });
       let processNode = {
         //第一步
         handleResults: 0, //处理结果0:不处理；1:同意；2:不同意；

src/views/mbsys/collaborative/meetingmanage/meetingapplication/registerForm.vue

@@ -405,18 +405,16 @@ export default {
       categoryType: [],
       form: {
         name: "", //采购名称
-        personLiable: "",
+        content: "",
         useDept: "",
-        registerTime: "", //申请时间
+        relationId: "", //申请时间
         startTime: "", //开始时间
         endTime: "", //结束时间
-        totalPrice: 0,
-        typeOne: 0,
+        dept: "",
+        deptStaff: "",
         dept: "", //督办部门
-        deptStaff: "", //督办人员
-        dbrs: [], //督办人员信息 ，层级为空
-        staffDtos: [], //督办人员信息 ，层级为空
-        remark: "", //备注
+        totalPrice: "", //督办人员
+        typeOne: "",
       },
 
       files: [], //上传附件
@@ -502,6 +500,7 @@ export default {
         this.form["useDept"] = this.editData.registerDept; //申购部门
         this.form["personLiable"] = this.editData.registerStaffName; //申购人
         this.form["totalPrice"] = this.editData.totalPrice; //申购人
+        this.form["remark"] = this.editData.remark; //备注
         this.form["registerTime"] = parseTime(
           new Date(this.editData.registerTime),
           "{y}-{m}-{d} {h}:{i}:{s}"

src/views/mbsys/collaborative/meetingmanage/meetingapproval/index.vue

@@ -458,13 +458,10 @@ export default {
       if (this.form.registerDept != "")
         Object.assign(map, { registerDept: this.form.registerDept });
       if (this.form.purchaseTime) {
-        Object.assign(
-          map,
-          {
-            stratTime: this.form.purchaseTime[0] + " 00:00:00",
-            endTime: this.form.purchaseTime[1]
-           + " 23:59:59"}
-        );
+        Object.assign(map, {
+          stratTime: this.form.purchaseTime[0] + " 00:00:00",
+          endTime: this.form.purchaseTime[1] + " 23:59:59",
+        });
       }
       getProcessList2(params, url).then((res) => {
         if (res.code == 1) {
@@ -638,29 +635,44 @@ export default {
       if (data.hasOwnProperty("configId")) {
         params = Object.assign(params, { configId: data.configId }); //流程配置ID
       }
-      if (data.hasOwnProperty("form")) {
-        Object.assign(params, {
-          name: data.form.name, //	名称
-          registerTime:
-            data.form.registerTime.length > 11
-              ? data.form.registerTime
-              : data.form.registerTime + " 00:00:00", //登记时间
-          supplierId: data.form.supplier, //供应商ID
-          supplier: data.form.factoryName, //供应商名称
-          telephone: data.form.contactNumber, //联系电话
-          useDept: data.form.useDept, //申购部门
-          totalPrice: data.form.allPrice, //总价
-          remark: data.form.remark, //备注
-        });
-      }
-      Object.assign(params, { ywType: this.businessType }); //业务类型
+      let documentDto = {
+        content: data.form.content, //会议内容
+        theme: data.form.name, //主题
+      };
+      // 关联设施字段
+      let prdtos = [];
+      prdtos.push({
+        relationId: data.form.relationId, //会议地址
+        tableId: 1, //会议地址
+      });
       let processNode = {
         //第一步
         handleResults: 0, //处理结果0:不处理；1:同意；2:不同意；
         saveState: state, //0保存，1提交
         annex: data.hasOwnProperty("existsFilesId") ? data.existsFilesId : "", //附件id
         remark: data.hasOwnProperty("examine") ? data.examine.remarks : "",
+        typeOne: data.form.typeOne, //是否发送通知
+        documentDto,
+        prdtos,
+        staffDtos: data.form.staffDtos,
       };
+      if (data.hasOwnProperty("form")) {
+        Object.assign(params, {
+          name: data.form.name, //	表单名称
+          registerTime: data.form.registerTime, //登记时间
+          startTime:
+            data.form.startTime.length > 11
+              ? data.form.startTime
+              : data.form.startTime + " 00:00:00", // 时间
+          endTime:
+            data.form.endTime.length > 11
+              ? data.form.endTime
+              : data.form.endTime + " 00:00:00", // 时间
+          remark: data.form.remark, //备注
+          totalPrice: data.form.totalPrice, // 人数
+        });
+      }
+      Object.assign(params, { ywType: this.businessType }); //业务类型
       //审核信息
       if (data.hasOwnProperty("examine")) {
         //下一步审核
@@ -682,39 +694,18 @@ export default {
           processStep: 1, //流程步骤(当前)
           stepNode: 1, //步骤节点(当前)
         });
+        if (
+          state == 1 &&
+          data.examine.headleState == 1 &&
+          (nextStep.deptStaff == "" || nextStep.deptStaff == null)
+        ) {
+          this.$message.warning("提交请选择下一步审核人");
+          return null;
+        }
       }
       //流程步骤 processStep
       //	步骤节点 stepNode
       Object.assign(params, { stepNode: 1 });
-      //物资信息 metrials
-      if (data.hasOwnProperty("metrials")) {
-        let stuffDtos = [];
-        data.metrials.forEach((metrial) => {
-          stuffDtos.push({
-            amountMoney: metrial.allPrice, //	金额
-            matterId: metrial.id, //物料ID
-            matterState: 1, //metrial.isAssets	物料状态1:新；2:旧  默认为1
-            quantity: metrial.purchaseNumber, //数量
-            unitPrice: parseFloat(metrial.purchasePrice), //单价
-          });
-        });
-        if (stuffDtos.length > 0)
-          Object.assign(processNode, { stuffDtos: stuffDtos }); //采购物资信息
-      }
-      //其他费用
-      if (data.hasOwnProperty("otherCost")) {
-        let otherCost = [];
-        data.otherCost.forEach((op) => {
-          otherCost.push({
-            amountMoney: op.cost, //金额
-            costName: op.costType, //费用名称
-            explain: op.remark, //费用说明
-            unitPrice: op.cost,
-          });
-        });
-        if (otherCost.length > 0)
-          Object.assign(processNode, { detailedDtos: otherCost }); //其他费用信息
-      }
 
       Object.assign(params, { processNode: processNode }); //业务类型
       const json = JSON.stringify(params);

src/views/mbsys/collaborative/vehiclemanage/vehicleapplication/index.vue

@@ -112,11 +112,11 @@
           label="申请时间"
           align="center"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="totalPrice"
           label="车牌号"
           align="center"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="startTime"
           label="用车开始时间"

src/views/mbsys/projectmanage/projectquery/detailsquery/index.vue

@@ -64,7 +64,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="开工时间:">
+          <el-form-item label="创建时间:">
             <el-date-picker
               v-model="form.purchaseTime"
               type="daterange"
@@ -340,7 +340,6 @@ export default {
       form: {
         content: "", //关键字
         registerDept: "",
-        purchaseTime: [], //申购时间
       },
       // 增加文档输入框
       input: "",
@@ -922,15 +921,12 @@ export default {
         Object.assign(map, { processState: this.form.processState });
       if (this.form.gclx != "") Object.assign(map, { gclx: this.form.gclx });
       if (this.form.node != "") Object.assign(map, { node: this.form.node });
-      // if (this.form.purchaseTime.length > 1) {
-      //   Object.assign(
-      //     map,
-      //     {
-      //       endTime: this.form.purchaseTime[0] + " 00:00:00",
-      //       stratTime: this.form.purchaseTime[1],
-      //     } + " 23:59:59"
-      //   );
-      // }
+      if (this.form.purchaseTime) {
+        Object.assign(map, {
+          stratTime: this.form.purchaseTime[0] + " 00:00:00",
+          endTime: this.form.purchaseTime[1] + " 23:59:59",
+        });
+      }
       getProcessList2(params, url).then((res) => {
         if (res.code == 1) {
           //this.tableData = res.result.records;

src/views/mbsys/projectmanage/projectstatistics/projectoverview/index.vue

@@ -64,7 +64,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="开工时间:">
+          <el-form-item label="创建时间:">
             <el-date-picker
               v-model="form.purchaseTime"
               type="daterange"
@@ -340,7 +340,6 @@ export default {
       form: {
         content: "", //关键字
         registerDept: "",
-        purchaseTime: [], //申购时间
       },
       // 增加文档输入框
       input: "",
@@ -922,15 +921,12 @@ export default {
         Object.assign(map, { processState: this.form.processState });
       if (this.form.gclx != "") Object.assign(map, { gclx: this.form.gclx });
       if (this.form.node != "") Object.assign(map, { node: this.form.node });
-      // if (this.form.purchaseTime.length > 1) {
-      //   Object.assign(
-      //     map,
-      //     {
-      //       endTime: this.form.purchaseTime[0] + " 00:00:00",
-      //       stratTime: this.form.purchaseTime[1],
-      //     } + " 23:59:59"
-      //   );
-      // }
+      if (this.form.purchaseTime) {
+        Object.assign(map, {
+          stratTime: this.form.purchaseTime[0] + " 00:00:00",
+          endTime: this.form.purchaseTime[1] + " 23:59:59",
+        });
+      }
       getProcessList2(params, url).then((res) => {
         if (res.code == 1) {
           //this.tableData = res.result.records;