统计页面修改 领料人修改

src/components/board/board.vue

@@ -502,14 +502,14 @@ export default {
     /* 10秒轮询一次 */
     this.lxTimer = setInterval(() => {
       this.getList()
-    }, 5000)
+    }, 30000)
     this.getTime()
   },
   destroyed () {
     clearInterval(this.nowTimer)
     clearInterval(this.lxTimer)
     // this.connection.stop()
-  }
+  } 
 }
 </script>
 

src/components/form/select-input.vue

@@ -35,11 +35,11 @@
 				<Input
 					v-model="inputValue"
 					@on-change="getSupplierSelectList"
-					placeholder="请输入用途关键词"
+					placeholder="请输入供应商关键词"
 				></Input>
 			</Poptip>
 		</div>
-        <!-- 物料 -->
+		<!-- 物料 -->
 		<div v-if="type == 3">
 			<Poptip trigger="focus" width="250" placement="bottom">
 				<div slot="content">
@@ -60,6 +60,41 @@
 				></Input>
 			</Poptip>
 		</div>
+		<!-- 人员 -->
+		<div v-if="type == 4">
+			<Select
+				v-model="inputValue"
+				style="width: 200px"
+				@on-change="materialListCk"
+				filterable
+			>
+				<div slot="empty">无匹配数据</div>
+				<Option
+					v-for="i in userList"
+					:value="i.label"
+					:key="i.id"
+					>{{ i.label }}</Option
+				>
+			</Select>
+			<!-- <Poptip trigger="focus" width="250" placement="bottom">
+				<div slot="content">
+					<ul style="" class="commons-select-search">
+						<li
+							:key="i.id"
+							v-for="i in userList"
+							@click="materialListCk(i)"
+						>
+							{{ i.label }}
+						</li>
+					</ul>
+				</div>
+				<Input
+					v-model="inputValue"
+					@on-change="getUUserList"
+					placeholder="请输入物料名称"
+				></Input>
+			</Poptip> -->
+		</div>
 	</div>
 </template>
 
@@ -79,6 +114,7 @@ export default {
 	watch: {
 		value: {
 			handler() {
+				console.log(this.value)
 				this.$emit('input', this.value)
 			},
 			immediate: true,
@@ -90,24 +126,24 @@ export default {
 			selectPurposeList: [],
 			inputValue: this.value,
 			supplierList: [],
-            materialList: [],
+			materialList: [],
+			userList:[],
 		}
 	},
 	methods: {
-        getMaterialSelectList() {
+		getMaterialSelectList() {
 			const v = this
 			v.loading = true
 			axios
 				.post('/cloudApi/material/selectList', {
-					pageNum:1,
-					pageSize:10,
-					search:this.inputValue,
+					pageNum: 1,
+					pageSize: 10,
+					search: this.inputValue,
 				})
 				.then((res) => {
 					v.materialList = res.data.data
 					v.loading = false
 				})
-			
 		},
 		getSupplierSelectList(req) {
 			const v = this
@@ -122,11 +158,30 @@ export default {
 					console.log(v.supplierList)
 				})
 		},
-        materialListCk(i){
-            console.log(i)
+		getUUserList(req) {
+			const v = this
+			v.loading = true
+			axios
+				.post('/cloudApi/uUser/list', {
+					deptIdList: ['A012', 'A008', 'A007', 'A017', 'A005'],
+				})
+				.then((res) => {
+					let list = res.data.data.map((item) => {
+						return {
+							label: item.realname,
+							value: item.id,
+							name: item.realname,
+						}
+					})
+					this.userList = list
+				})
+		},
+		materialListCk(i) {
+			console.log(i)
 			this.inputValue = i.name
 			this.$emit('input', i.name)
-        },
+			this.$emit('onChange', i.name)
+		},
 		supplierListCk(i) {
 			console.log(i)
 			this.inputValue = i.name
@@ -165,8 +220,10 @@ export default {
 				break
 			case '2':
 				v.getSupplierSelectList()
-            case '3':
+			case '3':
 				v.getMaterialSelectList()
+			case '4':
+				v.getUUserList()
 			default:
 				break
 		}

src/router/routers.js

@@ -333,6 +333,14 @@ export default [
         component: () => import("@/view/system-manage/vision-manage/vision-page"),
       },
       {
+        path: "/version_manage2",
+        name: "version_manage2",
+        meta: {
+          title: "版本控制",
+        },
+        component: () => import("@/view/system-manage/vision-manage/index"),
+      },
+      {
         path: "/store_update_old",
         name: "store_update_old",
         meta: {

src/store/module/user.js

@@ -135,6 +135,7 @@ export default {
         try {
           getUserInfo().then(res => {
             if (res.code === 0) {
+              window.localStorage.setItem('roleKey',res.result.roleKey)
               commit('setId', res.result.id)
               commit('setName', res.result.name)
               commit('setJobNo', res.result.jobNo)

src/view/base-manage/warehouse-maintenance/warehouse-maintenance.vue

@@ -61,90 +61,90 @@ export default {
           key: 'remark',
           minWidth: 250
         },
-        {
-          title: '操作',
-          key: 'action',
-          fixed: 'right',
-          align: 'center',
-          width: '200px',
-          render: (h, params) => {
-            return h('div', [
-              h(
-                'Button',
-                {
-                  props: {
-                    type: 'primary',
-                    size: 'small'
-                  },
-                  style: {
-                    marginRight: '20px'
-                  },
-                  on: {
-                    click: () => {
-                      this.$router.push({
-                        name: 'subarea_manage',
-                        query: {
-                          stockHouseId: params.row.id,
-                          name: params.row.name
-                        }
-                      })
-                    }
-                  }
-                },
-                '分区管理'
-              ),
-              h(
-                'Icon',
-                {
-                  props: {
-                    custom: 'iconfont icon-edit',
-                    size: '20',
-                    color: '#087BE1'
-                  },
-                  style: {
-                    marginRight: '20px'
-                  },
-                  on: {
-                    click: () => {
-                      for (const key in params.row) {
-                        this.formData[key] = params.row[key]
-                      }
-                      this.title = '修改'
-                      this.formType = 'edit'
-                      this.show = true
-                    }
-                  }
-                },
-                '修改'
-              ),
-              h(
-                'Icon',
-                {
-                  props: {
-                    custom: 'iconfont icon-delete',
-                    size: '20',
-                    color: 'red'
-                  },
-                  on: {
-                    click: () => {
-                      this.$MyModal.show({ text: '是否删除？' }).$on('confirm', () => {
-                        StockHouseDelete({
-                          id: params.row.id
-                        }).then(res => {
-                          if (res.code === 0) {
-                            this.$Message.info(res.msg)
-                            this.getList()
-                          }
-                        })
-                      })
-                    }
-                  }
-                },
-                '删除'
-              )
-            ])
-          }
-        }
+        // {
+        //   title: '操作',
+        //   key: 'action',
+        //   fixed: 'right',
+        //   align: 'center',
+        //   width: '200px',
+        //   render: (h, params) => {
+        //     return h('div', [
+        //       h(
+        //         'Button',
+        //         {
+        //           props: {
+        //             type: 'primary',
+        //             size: 'small'
+        //           },
+        //           style: {
+        //             marginRight: '20px'
+        //           },
+        //           on: {
+        //             click: () => {
+        //               this.$router.push({
+        //                 name: 'subarea_manage',
+        //                 query: {
+        //                   stockHouseId: params.row.id,
+        //                   name: params.row.name
+        //                 }
+        //               })
+        //             }
+        //           }
+        //         },
+        //         '分区管理'
+        //       ),
+        //       h(
+        //         'Icon',
+        //         {
+        //           props: {
+        //             custom: 'iconfont icon-edit',
+        //             size: '20',
+        //             color: '#087BE1'
+        //           },
+        //           style: {
+        //             marginRight: '20px'
+        //           },
+        //           on: {
+        //             click: () => {
+        //               for (const key in params.row) {
+        //                 this.formData[key] = params.row[key]
+        //               }
+        //               this.title = '修改'
+        //               this.formType = 'edit'
+        //               this.show = true
+        //             }
+        //           }
+        //         },
+        //         '修改'
+        //       ),
+        //       h(
+        //         'Icon',
+        //         {
+        //           props: {
+        //             custom: 'iconfont icon-delete',
+        //             size: '20',
+        //             color: 'red'
+        //           },
+        //           on: {
+        //             click: () => {
+        //               this.$MyModal.show({ text: '是否删除？' }).$on('confirm', () => {
+        //                 StockHouseDelete({
+        //                   id: params.row.id
+        //                 }).then(res => {
+        //                   if (res.code === 0) {
+        //                     this.$Message.info(res.msg)
+        //                     this.getList()
+        //                   }
+        //                 })
+        //               })
+        //             }
+        //           }
+        //         },
+        //         '删除'
+        //       )
+        //     ])
+        //   }
+        // }
       ],
       tableFilter: [
         {
@@ -158,13 +158,13 @@ export default {
           text: '查询',
           e: 'search'
         },
-        {
-          name: 'Button',
-          type: 'primary',
-          text: '添加',
-          align: 'right',
-          e: 'add'
-        }
+        // {
+        //   name: 'Button',
+        //   type: 'primary',
+        //   text: '添加',
+        //   align: 'right',
+        //   e: 'add'
+        // }
       ],
       params: {
         pageIndex: 1,

src/view/store-out-manage/daily-report/daily-report.vue

@@ -12,7 +12,7 @@
     <div class="border"></div>
     <div class="tab-nav">
       <Row>
-        <i-col span="8" style="display: flex">
+        <i-col span="6" style="display: flex">
           <div style="min-width: 40px; line-height: 32px; text-align: center">直喷:</div>
           <div class="row">
             <Button
@@ -27,7 +27,7 @@
             </Button>
           </div>
         </i-col>
-        <i-col span="8" style="display: flex">
+        <i-col span="6" style="display: flex">
           <div style="min-width: 40px; line-height: 32px; text-align: center">打纸:</div>
           <div class="row">
             <Button
@@ -42,7 +42,7 @@
             </Button>
           </div>
         </i-col>
-        <i-col span="8" style="display: flex">
+        <i-col span="6" style="display: flex">
           <div style="min-width: 40px; line-height: 32px; text-align: center">热转:</div>
           <div class="row">
             <Button
@@ -57,6 +57,21 @@
             </Button>
           </div>
         </i-col>
+        <i-col span="6" style="display: flex">
+          <div style="min-width: 40px; line-height: 32px; text-align: center">电割:</div>
+          <div class="row">
+            <Button
+              :type="btnIndex === item.userId + '_' + item.technologyType ? 'primary' : 'default'"
+              @click="userClick(item)"
+              v-for="(item, index) in typeList['A017']"
+              :key="index"
+            >
+              <span>{{ item.realName }}（</span>
+              <span style="color: red">{{ item.useRate }}%</span>
+              <span>）</span>
+            </Button>
+          </div>
+        </i-col>
       </Row>
     </div>
     <div class="border"></div>

src/view/store-out-manage/return-warehouse-total/return-warehouse-total.vue

@@ -4,6 +4,37 @@
       <div class="tab-nav">
         <div class="date-filter-wrap">
           <span style="font-size: 14px;font-weight: bold;color: black">每日退仓看板</span>
+          <RadioGroup v-model="params.status" style="margin-left:20px" @on-change="getList">
+              <Radio label="0">
+                 
+                  <span>未复核</span>
+              </Radio>
+              <Radio label="1">
+                 
+                  <span>已复核</span>
+              </Radio>
+              <Radio label="2">
+               
+                  <span>待审批</span>
+              </Radio>
+          </RadioGroup>
+          <select-input v-model="params.materialName" @onChange="getList" type="3"></select-input>
+          <Select
+            v-model="params.userName"
+            style="width: 200px"
+            @on-change="selectUserName"
+            filterable
+          >
+            <div slot="empty">无匹配数据</div>
+            <Option value="">全部</Option>
+            <Option
+              v-for="i in userList"
+              :value="i.label"
+              :key="i.id"
+              >{{ i.label }}</Option
+            >
+          </Select>
+          
         </div>
         <div class="date-filter-wrap">
           <date-select v-model="params" @change="selectTime"></date-select>
@@ -120,6 +151,7 @@
   </template>
   
   <script>
+  import  selectInput  from '@/components/form/select-input'
   import MyTable from '_c/my-table/my-table'
   import axios from 'axios'
   import dateSelect from '@/components/dateSelect/dateSelect'
@@ -127,7 +159,7 @@
   import {dateFormat} from '@/libs/util'
   export default {
     name: 'daily_report',
-    components: { MyTable, dateSelect,MyModalForm },
+    components: { MyTable, dateSelect,MyModalForm,selectInput },
     data() {
       return {
         shenpiModal:false,
@@ -269,7 +301,7 @@
                     },
                     style: {
                       marginRight: '20px',
-                      display:(params.row.status === 0 || params.row.flowStatus != 0) ? 'none' : ''
+                      display:(params.row.status === 0 || params.row.flowStatus != 0 ) ? 'none' : (this.roleKey != 'supervisor') ? 'none' : ''
                     },
                     on: {
                       click: () => {
@@ -305,7 +337,8 @@
           total: 0,
           technologyType: '',
           jobNo: '',
-          userId: ''
+          userId: '',
+          status:1,
         },
         statisticsDetails: {
           scheduleArea: '',
@@ -319,13 +352,34 @@
           backArea: '',
           useRate: '',
           actualUse: ''
-        }
+        },
+        roleKey:window.localStorage.getItem('roleKey'),
+        userList:[],
       }
     },
     mounted() {
       this.getAllList()
+      this.getUUserList()
     },
     methods: {
+      getUUserList() {
+        const v = this
+        v.loading = true
+        axios
+          .post('/cloudApi/uUser/list', {
+            deptIdList: ['A012', 'A008', 'A007', 'A017', 'A005'],
+          })
+          .then((res) => {
+            let list = res.data.data.map((item) => {
+              return {
+                label: item.realname,
+                value: item.id,
+                name: item.realname,
+              }
+            })
+            this.userList = list
+          })
+      },
       handleFlow(_type){
         axios.post('/cloudApi/stockBack/handleFlow',{id:this.formData.id,flowResult:_type}).then(res => {
           this.show = false
@@ -375,6 +429,7 @@
           })
       },
       userClick(item) {
+        this.params.userName = ''
         if (this.btnIndex === item.userId + '_' + item.technologyType) {
           this.params.userId = ''
           this.params.jobNo = ''
@@ -392,12 +447,18 @@
         this.params.pageNum = pageNum
         this.getList()
       },
+      selectUserName(){
+        this.params.userId = ""
+        this.getList()
+      },
       getList() {
         axios
           .post('/cloudApi/stockBack/getBackStatistics', {
             beginTime: this.params.beginTime,
             endTime: this.params.endTime,
-            userId: this.params.userId
+            userId: this.params.userId,
+            materialName:this.params.materialName,
+            userName:this.params.userName,
           })
           .then(res => {
             this.statisticsDetails = res.data.data
@@ -408,7 +469,11 @@
             pageSize: this.params.pageSize,
             beginTime: this.params.beginTime,
             endTime: this.params.endTime,
-            userId: this.params.userId
+            userId: this.params.userId,
+            status:this.params.status,
+            materialName:this.params.materialName,
+            userName:this.params.userName,
+            
           })
           .then(res => {
             this.data = res.data.data.records

src/view/store-out-manage/store-out-record/store-out-record.vue

@@ -17,6 +17,7 @@
 <script>
 import { exportExcel } from '@/libs/util'
 import { GetOutStockPageList } from '@/api/stock'
+import axios from 'axios'
 import MyForm from './my-form'
 import MyTable from '_c/my-table/my-table'
 import { GetUserPageList } from '@/api/user'
@@ -289,22 +290,35 @@ export default {
       this.params.pageIndex = pageIndex
       this.getList()
     },
-    getUserPageList () {
-      GetUserPageList({
-        pageIndex: 1,
-        pageSize: 9999,
-        takeUser: true
-      }).then(res => {
-        if (res.code === 0) {
-          let list = res.result.list.map(item => {
-            return {
-              label: item.realName,
-              value: item.id
-            }
-          })
-          this.tableFilter[2].list = list
-        }
-      })
+    getUserPageList () { 
+      axios
+				.post('/cloudApi/uUser/list', {
+					deptIdList: ['A012', 'A008', 'A007', 'A017', 'A005'],
+				})
+				.then((res) => {
+					let list = res.data.data.map((item) => {
+						return {
+							label: item.realname,
+							value: item.id,
+						}
+					})
+					this.tableFilter[2].list = list
+				})
+      // GetUserPageList({
+      //   pageIndex: 1,
+      //   pageSize: 9999,
+      //   takeUser: true
+      // }).then(res => {
+      //   if (res.code === 0) {
+      //     let list = res.result.list.map(item => {
+      //       return {
+      //         label: item.realName,
+      //         value: item.id
+      //       }
+      //     })
+      //     this.tableFilter[2].list = list
+      //   }
+      // })
     },
     getList () {
       GetOutStockPageList({

src/view/system-manage/store-update/my-form.vue

@@ -35,7 +35,7 @@
 <script>
 
 import { GetUserPageList } from '@/api/user'
-
+import axios from 'axios'
 export default {
   data () {
     return {
@@ -93,21 +93,22 @@ export default {
     }
   },
   mounted () {
-    GetUserPageList({
-      pageIndex: 1,
-      pageSize: 9999,
-      takeUser: true
-    }).then(res => {
-      if (res.code === 0) {
-        let list = res.result.list.map(item => {
-          return {
-            label: item.realName,
-            value: item.id
-          }
+    const v = this
+    v.loading = true
+    axios
+				.post('/cloudApi/uUser/list', {
+          deptIdList:['A012','A008','A007','A017','A005']
         })
-        this.userList = list
-      }
-    })
+				.then((res) => {
+					let list = res.data.data.map(item => {
+            return {
+              label: item.realname,
+              value: item.id
+            }
+          })
+          this.userList = list
+				})
+    
   }
 }
 </script>

src/view/system-manage/store-update/store-update.vue

@@ -172,7 +172,6 @@ export default {
       }
     },
     cfm (formData) {
-      console.log(formData)
       if (this.storeType === '出库') {
         StockTagOut({
           id: this.id,