Merge branch 'test' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

src/pages/main/advertising/materialApplication.vue

@@ -181,7 +181,7 @@
                 <div slot="footer" class="dialog-footer myfooter">
                     <el-button @click="dialogCli(4)">取 消</el-button>
                     <el-button type="primary" @click="dialogCli(5)">确 定</el-button>
-                    
+
                 </div>
             </div>
         </el-dialog>
@@ -354,7 +354,7 @@
                 }
                 timeFrom ? this.params.opTimeFrom = timeFrom : '';
                 timeTo ? this.params.opTimeTo = timeTo : '';
-                
+                // console.log(this.params);
                 this.getList(this.params, this.pageSize);
             },
             //获取列表
@@ -413,12 +413,12 @@
 				    this.infolist = Object.assign({}, res.data);
                     // console.log(JSON.parse(this.infolist.params.wo));
 				    this.infoApply = JSON.parse(this.infolist.params.wo);
-                    
+
 					this.rovaList = res.data.taskList;
 				});
             },
 
-            
+
             //添加
             dialogCli(v) {
                 if (v === 1) {
@@ -431,7 +431,7 @@
                         this.infolist.dealType = '2';
                         this.infolist.dealTypeDesc = this.approvalinfolist.opinion;
                         this.applicationDialogStatus = false;
-                       
+
                         this.submitInfo("/bpm/api/submitTask", this.infolist);
                     }
                 }
@@ -649,7 +649,7 @@
 		flex-wrap: wrap;
 		width: 100% !important;
 		margin-top: 20px;
-	
+
 		div {
 			display: inline-block;
 			width: 18% !important;
@@ -661,7 +661,7 @@
 			background: #fff;
 			position: relative;
 			height: 100px;
-	
+
 			img {
 				width: 100%;
 				position: absolute;
@@ -670,7 +670,7 @@
 				margin: auto;
 				// height: 100%;
 			}
-	
+
 		}
 	}
 </style>

src/pages/main/advertising/materialApplicationExa.vue

@@ -48,12 +48,16 @@
                     "
                     >任务分发</el-button
                 >
+<<<<<<< HEAD
                 <a
                     style="margin-right:50px; color:#169BD5; cursor:pointer"
                     @click="attStatus = true"
                     v-if="wo.fileUrl != null"
                     >下载附件</a
                 >
+=======
+                <a style="margin-right:50px; color:#169BD5; cursor:pointer" @click="attStatus = true;">下载附件</a>
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
 
                 <h3>预计总金额:{{ amountsum }}</h3>
                 <h3>总数: {{ countsum }}</h3>
@@ -299,6 +303,7 @@
                                 v-model="infolist.distributionChoose"
                                 placeholder="任务分发"
                             >
+<<<<<<< HEAD
                                 <el-option
                                     v-for="(items,
                                     index) in distributionRegionOpt"
@@ -335,6 +340,14 @@
                         </el-form-item>
                     </div>
                 </el-form>
+=======
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                </div>
+            </el-form>
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
 
                 <div class="t-footer">
                     <el-button type="primary" @click="dialogCli(5)"
@@ -437,6 +450,10 @@
                 </div>
             </div>
         </el-dialog>
+<<<<<<< HEAD
+=======
+
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
         <el-dialog
             title="附件"
             :visible.sync="attStatus"
@@ -449,6 +466,7 @@
             <div slot="title">
                 <div>
                     附件
+<<<<<<< HEAD
                     <i
                         class="el-icon-full-screen"
                         style="float: right; margin-right: 30px"
@@ -458,11 +476,23 @@
                             }
                         "
                     ></i>
+=======
+                    <i class="el-icon-full-screen" style="float: right; margin-right: 30px" @click="
+                () => {
+                  fullscreen = !fullscreen;
+                }"></i>
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
                 </div>
             </div>
             <div v-loading="loadinged">
                 <div style="margin: 10px 0">
+<<<<<<< HEAD
                     <uploadDown :datalist="datalist"></uploadDown>
+=======
+                    <uploadDown
+                        :datalist="datalist"
+                    ></uploadDown>
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
                 </div>
                 <div class="dialog-footer myfooter">
                     <el-button @click="attStatus = false">取 消</el-button>
@@ -481,21 +511,32 @@
 import mySearch from "../../../components/search.vue";
 import myMessage from "../../../components/myMessage.vue";
 import toolList from "../../../components/toolList";
+<<<<<<< HEAD
 import myUpload from "../../../components/upload";
 import deptTreeOnly from "../../../components/deptTreeOnly.vue";
 import { MessageBox } from "element-ui";
 import { Loading } from "element-ui";
+=======
+// import myUpload from "../../../components/upload";
+// import deptTreeOnly from "../../../components/deptTreeOnly.vue";
+// import { MessageBox } from "element-ui";
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
 import uploadDown from "../../../components/uploadDown";
 
 export default {
     components: {
         mySearch,
         myMessage,
-        deptTreeOnly,
-        MessageBox,
+        // deptTreeOnly,
+        // MessageBox,
         toolList,
+<<<<<<< HEAD
         myUpload,
         uploadDown
+=======
+        // myUpload,
+        uploadDown,
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
     },
     data() {
         const regionName = (rule, value, callback) => {
@@ -606,6 +647,7 @@ export default {
             userListOpt: [],
             cMkAdvMetirialWoInfoSubmit: {},
             stsArr: ["待审批", "审批通过", "打回"],
+<<<<<<< HEAD
             // 分发
             distributionDialogStatus: false,
             distributionRegionOpt: [],
@@ -619,6 +661,14 @@ export default {
             step: {},
             passedList:[],
             multipleSelection:[]
+=======
+            wo:{},
+            datalist: {
+                url: "/market/cadvBusiMetirialWo/checkExport",
+                type: 2,
+            },
+            attStatus: false,
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
         };
     },
     computed: {
@@ -663,7 +713,10 @@ export default {
             this.approvalinfolist = {};
             this.supplierDialogStatus = false;
             this.approvalStepDialogStatus = false;
+<<<<<<< HEAD
             this.distributionDialogStatus = false;
+=======
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
             this.attStatus = false;
         },
         //搜索数据
@@ -690,6 +743,7 @@ export default {
                 },
                 data: v
             }).then(res => {
+<<<<<<< HEAD
                 // console.log(res.data.body);
                 // this.tableData = res.data.body.pageList.data;
                 res.data.body.pageList.data.forEach(item=>{
@@ -716,6 +770,14 @@ export default {
                 
                 
                 
+=======
+                // console.log(res.data);
+                this.tableData = res.data.body.pageList.data;
+                this.userListOpt = res.data.body.queryCurrentAndNext.next.userList;
+                this.total = res.data.totalRecord;
+                this.wo = res.data.body.wo;
+                this.datalist.attList = JSON.parse(this.wo.fileUrl);
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
                 this.loading = false;
                 
             });
@@ -798,7 +860,11 @@ export default {
                     }).then(res => {
                         console.log(res);
                     });
+<<<<<<< HEAD
                 // }
+=======
+                }
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
             } else if (v === 3) {
                 this.$http({
                     url: "/market/cadvBusiMetirialWo/export",
@@ -811,7 +877,11 @@ export default {
                 }).then(res => {
                     if (window.navigator && window.navigator.msSaveOrOpenBlob) {
                         let blob = new Blob([res.data], {
+<<<<<<< HEAD
                             type: "application/vnd.ms-excel"
+=======
+                            type: "application/vnd.ms-excel",
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
                         });
                         window.navigator.msSaveOrOpenBlob(
                             blob,
@@ -871,7 +941,7 @@ export default {
         //添加
         dialogCli(v) {
             this.dialogStatus = false;
-            // 1审批 2审批轨迹 3导出 4供应商 5任务分发
+            // 1审批 2审批轨迹 3导出 4供应商 5任务分发 8附件
             if (v === 1) {
                 this.approvalDialogStatus = false;
                 // let list = {};
@@ -976,6 +1046,7 @@ export default {
                 // this.multipleSelection.supplierCode = supplierChoose[0].code;
                 // console.log(this.multipleSelection);
             } else if (v === 5) {
+<<<<<<< HEAD
                 this.cWoInfoIssued.nextOpNo = this.treeListonly.leaderAuditNo;
                 this.cWoInfoIssued.nextOpName = this.treeListonly.leaderAuditName;
                 this.cWoInfoIssued.woId = this.params.woId;
@@ -987,6 +1058,9 @@ export default {
                     this.cWoInfoIssued
                 );
             } else if (v === 6) {
+=======
+            }else if (v === 6) {
+>>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
                 let userListSingle = "";
                 userListSingle = this.userListOpt.filter(item => {
                     return item.loginNameStr == this.infolist.loginNameStr;

src/pages/main/advertising/materialApplicationadd.vue

@@ -1123,7 +1123,6 @@ export default {
         },
         uploadBack(v) {
             this.attList = v;
-            // console.log(v);
         },
         // verifcheck() {
         //     for (let i = 0; i < this.regionOpt.length; i++) {