Merge branch 'master' into 'file-share'

# Conflicts:
#   src/pages/main/file/flieList.vue

src/pages/main/demandDevelop/index.vue

@@ -97,7 +97,11 @@
             </el-form-item>
             <el-form-item>
               <span>需求编号</span>
-              <el-input v-model="infolist.demandNo" placeholder="需求编号" disabled>
+              <el-input
+                v-model="infolist.demandNo"
+                placeholder="需求编号"
+                disabled
+              >
               </el-input>
             </el-form-item>
             <!-- <el-form-item prop="terminal">
@@ -677,13 +681,15 @@ export default {
               console.log("送领导审核");
               break;
             case "送起草人编号发送":
+              this.operateName = "送起草人编号";
               this.handleSendNo();
               break;
             case "确认编号":
+              this.operateName = "确认编号";
               this.handleComfirmNo();
               break;
             case "打回":
-              this.operateName = "打回"
+              this.operateName = "打回";
               this.handleBackRecord();
               break;
             case "确认需求":
@@ -952,10 +958,10 @@ export default {
         carryChannelCode: this.infolist.carryChannelCode.join(","),
         // 加载周期 起止
         busiStartTime: this.busiTime[0]
-          ? this.$formatDate(this.busiTime[0], "YYYY-MM-DD HH:mm:ss")
+          ? this.$formatDate(this.busiTime[0], "YYYY-MM-DD")
           : "",
         busiEndTime: this.busiTime[1]
-          ? this.$formatDate(this.busiTime[1], "YYYY-MM-DD HH:mm:ss")
+          ? this.$formatDate(this.busiTime[1], "YYYY-MM-DD")
           : "",
         // 需求背景
         demandBackground: this.infolist.demandBackground,
@@ -1034,6 +1040,9 @@ export default {
         },
         params: {
           woNo: this.woNo,
+          remark: [this.operateName, this.remark]
+            .filter((el) => el !== "")
+            .join(","),
         },
       }).then(({ data: { desc } }) => {
         console.log(desc);
@@ -1054,7 +1063,12 @@ export default {
         headers: {
           "Content-Type": "application/json",
         },
-        data: { woNo: this.woNo + "" },
+        data: {
+          woNo: this.woNo + "",
+          remark: [this.operateName, this.remark]
+            .filter((el) => el !== "")
+            .join(","),
+        },
       }).then(({ data: { desc } }) => {
         console.log(desc);
         if (desc === "操作成功") {
@@ -1081,9 +1095,10 @@ export default {
       }).then(
         ({
           data: {
-            body: { data },
+            body: { data, count },
           },
         }) => {
+          this.total = count;
           this.tableData = data;
         }
       );
@@ -1286,8 +1301,8 @@ export default {
     },
     // 分页
     currchange(v) {
-      this.pageSize = v;
-      this.getList(this.params, this.pageSize);
+      this.page = v;
+      this.handleInit();
     },
     //申请  // 打开弹出层
     dialogCheck(type, data) {

src/pages/main/demandDevelop/ywStanding.vue

@@ -66,12 +66,12 @@ export default {
           value: "",
           width: "23%",
         },
-				{
-					type: "input",
+        {
+          type: "input",
           tit: "部门或地市",
           value: "",
           width: "23%",
-				},
+        },
         {
           type: "date",
           tit: "开始时间",
@@ -88,7 +88,7 @@ export default {
       tooltit: "线上业务需求台账",
       fullscreen: false,
       total: 0,
-			page:1,
+      page: 1,
       pageSize: 10,
       tableData: [],
       dialogStatus: false,
@@ -109,38 +109,40 @@ export default {
   methods: {
     //搜索数据
     searchInfo(v) {
-			console.log(v);
       this.params = {};
       v[0] ? (this.params.demandName = v[0]) : "";
       v[1] ? (this.params.deptOrCity = v[1]) : "";
-      v[2] ? (this.params.startTime = v[2]) : "";
-      v[3] ? (this.params.endTime = v[3]) : "";
+      v[2]
+        ? (this.params.startTime = this.$formatDate(v[2], "YYYY-MM-DD"))
+        : "";
+      v[3] ? (this.params.endTime = this.$formatDate(v[3], "YYYY-MM-DD")) : "";
       this.handleInit();
     },
     // 初始化列表
     handleInit() {
-			this.$http({
-				url: "/market/mkOnlineChannel/ledgerList",
+      this.$http({
+        url: "/market/mkOnlineChannel/ledgerList",
         method: "post",
         headers: {
           "Content-Type": "application/json",
         },
         data: {
-					...this.params,
+          ...this.params,
           page: this.page,
           pageSize: this.pageSize,
         },
       }).then(
         ({
           data: {
-            body: { data },
+            body: { data, count },
           },
         }) => {
           this.tableData = data;
+          this.total = count;
         }
       );
-		},
-		outlist() {
+    },
+    outlist() {
       // let data = {
       //   colStr:
       //     "demandName,deptName,busiStartTime,busiEndTime,factoryName,workLoad",
@@ -218,14 +220,12 @@ export default {
         }
       });
     },
-		// 分页
+    // 分页
     currchange(v) {
       this.page = v;
-			this.handleInit()
+      this.handleInit();
     },
 
-
-
     //获取列表
     getList(v, n) {
       v.sts = 1;
@@ -244,18 +244,18 @@ export default {
         this.total = res.data.totalRecord;
       });
     },
-    
+
     //功能栏
     iconCli(v) {
       if (v === 1) {
-        this.handleInit()
+        this.handleInit();
       }
       if (v === 2) {
         this.fullscreen = !this.fullscreen;
       }
     },
     // =======================
-    
+
     getUser() {
       this.userInfo = JSON.parse(window.sessionStorage.userInfo);
       this.infolist = {
@@ -268,7 +268,7 @@ export default {
   },
   mounted() {
     // this.getList({}, 1);
-		this.handleInit()
+    this.handleInit();
     this.getUser();
   },
   created() {},

src/pages/main/file/flieList.vue

@@ -28,7 +28,9 @@
                   ? "当前选择节点名称：" + actionName
                   : "当前无选择节点"
               }}
-              <span v-show="actionName" class="clearStyle" @click="clearClick">取消选择</span>
+              <span v-show="actionName" class="clearStyle" @click="clearClick"
+                >取消选择</span
+              >
             </template>
           </el-alert>
           <div style="margin: 10px 0">
@@ -455,14 +457,17 @@ export default {
           let blob = new Blob([response.data], {
             type: "application/vnd.ms-excel",
           });
-          window.navigator.msSaveOrOpenBlob(blob, new Date().getTime()+".zip");
+          window.navigator.msSaveOrOpenBlob(
+            blob,
+            new Date().getTime().toString() + ".zip"
+          );
         } else {
           /* 火狐谷歌的文件下载方式 */
           var blob = new Blob([response.data]);
           var downloadElement = document.createElement("a");
           var href = window.URL.createObjectURL(blob);
           downloadElement.href = href;
-          downloadElement.download = new Date().getTime()+".zip";
+          downloadElement.download = new Date().getTime().toString() + ".zip";
           document.body.appendChild(downloadElement);
           downloadElement.click();
           document.body.removeChild(downloadElement);
@@ -932,7 +937,7 @@ export default {
 <style lang="scss" scoped>
 .container {
   background-color: #f0f2f5;
-  .clearStyle{
+  .clearStyle {
     cursor: pointer;
     color: #0b82ff;
   }