zhangjinxing 3 years ago
parent
commit
8e5af10fe9

+ 2 - 2
src/views/interest/handover/components/addEditForm.vue

@@ -106,7 +106,7 @@ export default {
       if (res && res.code === 0) {
         console.log(res);
         console.log(this.ruleForm);
-        this.$router.push({
+        window.vm.$router.push({
           path: "handover",
         });
       } else if (res && res.code >= 100 && res.code <= 104) {
@@ -189,7 +189,7 @@ export default {
               hand_uid: hand_uid.toString(),
             };
             const res = await asyncRequest.update(model);
-            this.$router.push({
+            window.vm.$router.push({
               path: "handover",
             });
             this.loading = false;

+ 46 - 30
src/views/interest/handover/index.vue

@@ -45,7 +45,9 @@
                     @searchChange="handleHandoverName"
                   />
                 </el-col>
-                <el-col :span="4" style="width: 125px; padding: 0 0 0 10px">
+
+                <!-- style="width: 125px; padding: 0 0 0 10px" -->
+                <el-col :span="4" class="auditStatus">
                   <el-select
                     v-model="type"
                     filterable
@@ -61,36 +63,11 @@
                     </el-option>
                   </el-select>
                 </el-col>
-                <el-col :span="5" style="width: 305px; padding: 0px 0 0 10px">
-                  <period-date-picker
-                    :width="'135px'"
-                    :size="searchSize"
-                    @timeReturned="handleTime"
-                  />
-                </el-col>
-                <el-col :span="4" style="width: 54px; padding: 0 0 0 0">
-                  <el-button
-                    :size="searchSize"
-                    type="primary"
-                    class="fr"
-                    icon="el-icon-search"
-                    @click="searchList"
-                /></el-col>
-                <el-col :span="4" style="width: 66px; padding: 0 0 0 0">
-                  <el-button
-                    type="warning"
-                    class="fr"
-                    :size="searchSize"
-                    @click="restSearch"
-                  >
-                    重置
-                  </el-button>
-                </el-col>
                 <el-col :span="3" style="width: 66px; float: right">
                   <el-button
                     :size="searchSize"
                     type="primary"
-                    style="float: right; margin-left: 5px"
+                    style="float: right"
                     @click="searchList"
                   >
                     刷新
@@ -110,6 +87,31 @@
                     新建
                   </el-button>
                 </el-col>
+                <el-col :span="5" style="width: 305px" class="pt10">
+                  <period-date-picker
+                    :width="'135px'"
+                    :size="searchSize"
+                    @timeReturned="handleTime"
+                  />
+                </el-col>
+                <el-col :span="4" style="width: 54px" class="pt10">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    class="fr"
+                    icon="el-icon-search"
+                    @click="searchList"
+                /></el-col>
+                <el-col :span="4" style="width: 66px" class="pt10">
+                  <el-button
+                    type="warning"
+                    class="fr"
+                    :size="searchSize"
+                    @click="restSearch"
+                  >
+                    重置
+                  </el-button>
+                </el-col>
               </el-col>
             </el-row>
           </div>
@@ -262,7 +264,7 @@ export default {
     // 表格行选中的方法
     RowClick(e) {
       console.log(e);
-      this.$router.push({
+      window.vm.$router.push({
         path: "newProcess",
         query: {
           id: e.id,
@@ -281,7 +283,6 @@ export default {
         // size: 10, // 每页显示条数
         resign_uid: "",
         hand_uid: "",
-        
       };
       this.searchList();
     },
@@ -335,5 +336,20 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
+.auditStatus {
+  width: 125px;
+  padding: 0 0 0 10px;
+}
+.pt10 {
+  padding: 0 0 0 10px;
+}
+@media screen and (max-width: 1300px) {
+  .auditStatus {
+    width: 450px;
+  }
+  .pt10 {
+    padding-top: 10px;
+  }
+}
 </style>

+ 1 - 0
src/views/purchaseIn/storeManage/addEdit.vue

@@ -19,6 +19,7 @@
           <el-form
             :model="ruleForm"
             :rules="rules"
+            status-icon
             ref="ruleForm"
             label-width="120px"
           >

+ 1 - 1
src/views/purchaseIn/storeManage/index.vue

@@ -324,7 +324,7 @@ export default {
 
     handleClick() {
       console.log("采购反馈");
-      this.$router.push({
+      window.vm.$router.push({
         path: "storeManageFlow",
       });
     },

+ 1 - 1
src/views/purchaseIn/storeSet/index.vue

@@ -350,7 +350,7 @@ export default {
       this.searchList();
     },
     addList(id) {
-      this.$router.push({
+      window.vm.$router.push({
         path: "addStore",
         query: {
           id: id,

+ 1 - 1
src/views/stock/allot/index.vue

@@ -258,7 +258,7 @@ export default {
     addSearch() {
       //跳转到新建页面
       console.log("新建申请");
-      this.$router.push({
+      window.vm.$router.push({
         path: "allotFlow",
       });
     },