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

src/pages/main/advertising/materialApplicationExa.vue

@@ -94,7 +94,7 @@
                     type="primary"
                     @click="dialogApplication(3)"
                     style="margin-right: 20px;margin-bottom: 20px;"
-                    >导出</el-button
+                >导出</el-button
                 >
                 <el-button
                     type="primary"
@@ -105,7 +105,7 @@
                             (step.serialNum == 5 && step.provinceCity == 2) ||
                             (step.serialNum == 6 && step.provinceCity == 3)
                     "
-                    >供应商</el-button
+                >供应商</el-button
                 >
                 <el-button
                     type="primary"
@@ -116,13 +116,13 @@
                             (step.serialNum == 9 && step.provinceCity == 2) ||
                             (step.serialNum == 10 && step.provinceCity == 3)) && isBtnShow
                     "
-                    >任务分发</el-button
+                >任务分发</el-button
                 >
                 <a
                     style="margin-right:50px; color:#169BD5; cursor:pointer"
                     @click="attStatus = true"
                     v-if="wo.fileUrl != null"
-                    >下载附件</a
+                >下载附件</a
                 >
 
                 <h3>预计总金额:{{ amountsum }}</h3>
@@ -186,8 +186,8 @@
                             <div>
                                 {{
                                     scope.row.quantity *
-                                        scope.row.price *
-                                        scope.row.coefficient
+                                    scope.row.price *
+                                    scope.row.coefficient
                                 }}
                             </div>
                         </template>
@@ -250,7 +250,7 @@
                 <div slot="footer" class="dialog-footer myfooter">
                     <el-button @click="closedia">取 消</el-button>
                     <el-button type="primary" @click="dialogCli(1)"
-                        >确 定</el-button
+                    >确 定</el-button
                     >
                 </div>
             </div>
@@ -339,7 +339,7 @@
 
                 <div class="t-footer">
                     <el-button type="primary" @click="dialogCli(4)"
-                        >确 定</el-button
+                    >确 定</el-button
                     >
                     <el-button @click="closedia">取 消</el-button>
                 </div>
@@ -408,7 +408,7 @@
 
                 <div class="t-footer">
                     <el-button type="primary" @click="dialogCli(5)"
-                        >确 定</el-button
+                    >确 定</el-button
                     >
                     <el-button @click="closedia">取 消</el-button>
                 </div>
@@ -454,10 +454,10 @@
 
                 <div class="t-footer">
                     <el-button type="primary" @click="dialogCli(6)"
-                        >确 定</el-button
+                    >确 定</el-button
                     >
                     <el-button @click="fixedDialogStatus = false"
-                        >取 消</el-button
+                    >取 消</el-button
                     >
                 </div>
             </div>
@@ -501,7 +501,7 @@
                     style="text-align: right;padding-bottom: 20px;"
                 >
                     <el-button type="primary" @click="dialogCli(7)"
-                        >确 定</el-button
+                    >确 定</el-button
                     >
                     <el-button @click="closedia">取 消</el-button>
                 </div>
@@ -881,13 +881,13 @@ export default {
                         })
                         if(n==1){
                             MessageBox.alert(
-                                    "请先选择供应商再进行审批",
-                                    "温馨提示",
-                                    {
-                                        confirmButtonText: "确定"
-                                    }
-                                );
-                                return;
+                                "请先选择供应商再进行审批",
+                                "温馨提示",
+                                {
+                                    confirmButtonText: "确定"
+                                }
+                            );
+                            return;
                         }else{
                             this.titname = "审批";
                             this.approvalDialogStatus = true;

src/pages/main/budget/budgetIndex.vue

@@ -52,13 +52,13 @@
 						sts:0,
 						num:0
 					},
-					{
-						label: "预算回复",
-						path: "/recallAdmin",
-						name: "recallAdmin",
-						sts:0,
-						num:0
-					},
+					// {
+					// 	label: "预算回复",
+					// 	path: "/recallAdmin",
+					// 	name: "recallAdmin",
+					// 	sts:0,
+					// 	num:0
+					// },
 					{
 						label: "预算模板管理",
 						path: "/budgetList",