Przeglądaj źródła

Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

mengy 3 lat temu
rodzic
commit
af7e7bf303

+ 3 - 3
shanXiPlatform/src/views/countQuality/delivery/alldeliveryQuality.vue

@@ -99,7 +99,7 @@ export default {
99 99
     methods: {
100 100
         selectchange(val) {
101 101
             this.qType = val
102
-              this.getList()
102
+            //   this.getList()
103 103
             // this.pageParam.condition =
104 104
             //     "{depotYpte:1 ,statTime: '" +
105 105
             //     this.statTime +
@@ -120,7 +120,7 @@ export default {
120 120
             //     "' ,qType:'" +
121 121
             //     this.qType +
122 122
             //     "' }"
123
-              this.getList()
123
+            //   this.getList()
124 124
         },
125 125
         clear() {
126 126
             this.arrTime = []
@@ -135,7 +135,7 @@ export default {
135 135
             //     "' ,qType:'" +
136 136
             //     this.qType +
137 137
             //     "' }"
138
-            this.getList()
138
+            // this.getList()
139 139
         },
140 140
         goodsInfo(row) {
141 141
             if (row.columnIndex == 3 || row.columnIndex == 4) {

+ 2 - 2
shanXiPlatform/src/views/countQuality/inventory/allinventoryQuality.vue

@@ -95,7 +95,7 @@ export default {
95 95
     methods: {
96 96
         selectchange(val) {
97 97
             this.qType = val
98
-            this.getList( )
98
+            // this.getList( )
99 99
         },
100 100
         timechange(val) {
101 101
             this.statTime = val[0]
@@ -106,7 +106,7 @@ export default {
106 106
             this.arrTime = []
107 107
             this.statTime = ""
108 108
             this.endTime = ""
109
-            this.getList()
109
+            // this.getList()
110 110
         },
111 111
         goodsInfo(row) {
112 112
             if (row.columnIndex == 3 || row.columnIndex == 4) {

+ 2 - 1
shanXiPlatform/src/views/outsideHouse/Emanage/gInspection.vue

@@ -16,8 +16,9 @@
16 16
                     <el-form-item>
17 17
                         <el-button type="info" class="iconfont iconclear" plain @click="clear">清空</el-button>
18 18
                         <el-button type="success" icon="el-icon-search" plain @click="search">查询</el-button>
19
-                        <el-button type="success" icon="el-icon-circle-plus" v-if="(this.alternateFieldsOne == 0 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(191)" plain @click="addbtn">新增</el-button>
20 19
                     </el-form-item>
20
+                        <el-button type="success" style="float:right;" icon="el-icon-circle-plus" v-if="(this.alternateFieldsOne == 0 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(191)" plain @click="addbtn">新增</el-button>
21
+
21 22
                 </el-form>
22 23
                 <el-table :header-row-class-name="goodsInfo" :cell-class-name="goodsInfo" border :data="personData" highlight-current-row @current-change="handleCurrentChange" style="width: 100%" :header-cell-style="{ background: '#f8f8f8' }">
23 24
                     <el-table-column width='50' type="index" align="center" label="序号"></el-table-column>

+ 44 - 17
shanXiPlatform/src/views/outsideHouse/Emanage/sInspection.vue

@@ -3,12 +3,12 @@
3 3
         <div id="mainRight">
4 4
             <div>
5 5
                 <el-form :inline="true">
6
-                      <el-form-item label="检查时间:" label-width="80px">
6
+                    <el-form-item label="检查时间:" label-width="80px">
7 7
                         <el-date-picker @change='timechange' v-model="arrTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
8 8
                         </el-date-picker>
9 9
                     </el-form-item>
10 10
                     <el-form-item label="公司名称:" label-width="80px">
11
-                        <el-select style="width:180px" @change='compselect' v-model="companyId"  clearable placeholder="请选择" class="roleSelect">
11
+                        <el-select style="width:180px" @change='compselect' v-model="companyId" clearable placeholder="请选择" class="roleSelect">
12 12
                             <el-option v-for="item in roleListn" :key="item.id" :label="item.name" :value="item.id">
13 13
                             </el-option>
14 14
                         </el-select>
@@ -16,8 +16,8 @@
16 16
                     <el-form-item>
17 17
                         <el-button type="info" class="iconfont iconclear" plain @click="clear">清空</el-button>
18 18
                         <el-button type="success" icon="el-icon-search" plain @click="search">查询</el-button>
19
-                        <el-button type="success" icon="el-icon-circle-plus" v-if="(this.alternateFieldsOne == 0 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(212)"  plain @click="addbtn">新增</el-button>
20 19
                     </el-form-item>
20
+                    <el-button type="success" style="float:right;" icon="el-icon-circle-plus" v-if="(this.alternateFieldsOne == 0 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(212)" plain @click="addbtn">新增</el-button>
21 21
                 </el-form>
22 22
                 <el-table :header-row-class-name="goodsInfo" :cell-class-name="goodsInfo" border :data="personData" highlight-current-row @current-change="handleCurrentChange" style="width: 100%" :header-cell-style="{ background: '#f8f8f8' }">
23 23
                     <el-table-column width='50' type="index" align="center" label="序号"></el-table-column>
@@ -32,9 +32,9 @@
32 32
                     </el-table-column>
33 33
                     <el-table-column width='230' property="operation" label="操作" align="center">
34 34
                         <template slot-scope="scope">
35
-                            <el-button size="mini" type="detailbtn"  v-if="$tools.IsPermission(211)"  @click="detailry(scope.$index, scope.row)">查看</el-button>
36
-                            <el-button size="mini" type="editbtn"  v-if="$tools.IsPermission(213)"  :disabled="alternateFieldsOne != 0 && alternateFieldsOne != 3" @click="editry(scope.$index, scope.row)">修改</el-button>
37
-                            <el-button size="mini" type="dangerbtn"  v-if="$tools.IsPermission(214)"  @click="deletery(scope.$index, scope.row)">删除</el-button>
35
+                            <el-button size="mini" type="detailbtn" v-if="$tools.IsPermission(211)" @click="detailry(scope.$index, scope.row)">查看</el-button>
36
+                            <el-button size="mini" type="editbtn" v-if="$tools.IsPermission(213)" :disabled="alternateFieldsOne != 0 && alternateFieldsOne != 3" @click="editry(scope.$index, scope.row)">修改</el-button>
37
+                            <el-button size="mini" type="dangerbtn" v-if="$tools.IsPermission(214)" @click="deletery(scope.$index, scope.row)">删除</el-button>
38 38
                         </template>
39 39
                     </el-table-column>
40 40
                 </el-table>
@@ -48,14 +48,14 @@
48 48
 <script>
49 49
 import Pagination from "@/components/Pagination"
50 50
 import { getUser } from "@/utils/auth"
51
-import { deleteaq, getaq ,getAllname } from "@/api/outsideHouse/index"
51
+import { deleteaq, getaq, getAllname } from "@/api/outsideHouse/index"
52 52
 export default {
53 53
     components: { Pagination },
54 54
     data() {
55 55
         return {
56
-             roleListn: [],
56
+            roleListn: [],
57 57
             arrTime: "",
58
-             companyId: "",
58
+            companyId: "",
59 59
             statTime: "",
60 60
             endTime: "",
61 61
             personData: [],
@@ -67,16 +67,25 @@ export default {
67 67
             },
68 68
             id: "",
69 69
             name: "",
70
-             alternateFieldsOne:''
70
+            alternateFieldsOne: ""
71 71
         }
72 72
     },
73 73
     created() {
74 74
         this.id = JSON.parse(getUser()).depotId
75 75
         this.name = JSON.parse(getUser()).depotName
76
-          this.alternateFieldsOne = JSON.parse(getUser()).alternateFieldsOne
77
-         this.pageParam.condition ="{mType:0 , companyId: '" +this.companyId +"' , statTime: '" +this.statTime +"' , endTime:'" +this.endTime +"' , depotId:'" + this.id + "' }"
76
+        this.alternateFieldsOne = JSON.parse(getUser()).alternateFieldsOne
77
+        this.pageParam.condition =
78
+            "{mType:0 , companyId: '" +
79
+            this.companyId +
80
+            "' , statTime: '" +
81
+            this.statTime +
82
+            "' , endTime:'" +
83
+            this.endTime +
84
+            "' , depotId:'" +
85
+            this.id +
86
+            "' }"
78 87
         this.getList()
79
-          getAllname(this.id).then(res => {
88
+        getAllname(this.id).then(res => {
80 89
             let obj = {
81 90
                 id: "",
82 91
                 name: ""
@@ -91,19 +100,37 @@ export default {
91 100
         })
92 101
     },
93 102
     methods: {
94
-           compselect( val ){
95
-              this.pageParam.condition ="{mType:0 , companyId: '" + val +"' , statTime: '" +this.statTime +"' , endTime:'" +this.endTime +"' , depotId:'" + this.id + "' }"  
103
+        compselect(val) {
104
+            this.pageParam.condition =
105
+                "{mType:0 , companyId: '" +
106
+                val +
107
+                "' , statTime: '" +
108
+                this.statTime +
109
+                "' , endTime:'" +
110
+                this.endTime +
111
+                "' , depotId:'" +
112
+                this.id +
113
+                "' }"
96 114
         },
97 115
         timechange(val) {
98 116
             this.statTime = val[0]
99 117
             this.endTime = val[1]
100
-             this.pageParam.condition ="{mType:0 , companyId: '" +this.companyId +"' , statTime: '" +this.statTime +"' , endTime:'" +this.endTime +"' , depotId:'" + this.id + "' }"
118
+            this.pageParam.condition =
119
+                "{mType:0 , companyId: '" +
120
+                this.companyId +
121
+                "' , statTime: '" +
122
+                this.statTime +
123
+                "' , endTime:'" +
124
+                this.endTime +
125
+                "' , depotId:'" +
126
+                this.id +
127
+                "' }"
101 128
         },
102 129
         clear() {
103 130
             this.arrTime = []
104 131
             this.statTime = ""
105 132
             this.endTime = ""
106
-            this.companyId=''
133
+            this.companyId = ""
107 134
             this.pageParam.condition = '{mType:0, depotId:"' + this.id + '"}'
108 135
             this.getList()
109 136
         },

+ 1 - 1
shanXiPlatform/src/views/outsideHouse/rentWarehouse/gRenthouse.vue

@@ -16,8 +16,8 @@
16 16
                     <el-form-item>
17 17
                         <el-button type="info" class="iconfont iconclear" plain @click="clear">清空</el-button>
18 18
                         <el-button type="success" icon="el-icon-search" plain @click="search">查询</el-button>
19
-                        <el-button type="success" v-if="(this.alternateFieldsOne == 1 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(201)" icon="el-icon-circle-plus" plain @click="addbtn">新增</el-button>
20 19
                     </el-form-item>
20
+                    <el-button type="success" style="float:right;" v-if="(this.alternateFieldsOne == 1 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(201)" icon="el-icon-circle-plus" plain @click="addbtn">新增</el-button>
21 21
                 </el-form>
22 22
                 <el-table :header-row-class-name="goodsInfo" :cell-class-name="goodsInfo" border :data="personData" highlight-current-row @current-change="handleCurrentChange" style="width: 100%" :header-cell-style="{ background: '#f8f8f8' }">
23 23
                     <el-table-column width='50' type="index" align="center" label="序号"></el-table-column>

+ 2 - 1
shanXiPlatform/src/views/outsideHouse/rentWarehouse/sRenthouse.vue

@@ -16,8 +16,9 @@
16 16
                     <el-form-item>
17 17
                         <el-button type="info" class="iconfont iconclear" plain @click="clear">清空</el-button>
18 18
                         <el-button type="success" icon="el-icon-search" plain @click="search">查询</el-button>
19
-                        <el-button type="success" v-if="(this.alternateFieldsOne == 1 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(216)" icon="el-icon-circle-plus" plain @click="addbtn">新增</el-button>
20 19
                     </el-form-item>
20
+                        <el-button type="success" style="float:right;"  v-if="(this.alternateFieldsOne == 1 || this.alternateFieldsOne == 3 ) && $tools.IsPermission(216)" icon="el-icon-circle-plus" plain @click="addbtn">新增</el-button>
21
+
21 22
                 </el-form>
22 23
                 <el-table :header-row-class-name="goodsInfo" :cell-class-name="goodsInfo" border :data="personData" highlight-current-row @current-change="handleCurrentChange" style="width: 100%" :header-cell-style="{ background: '#f8f8f8' }">
23 24
                     <el-table-column width='50' type="index" align="center" label="序号"></el-table-column>