1
0

6 Ревизии 9f9be3fd3e ... 42a524bfda

Автор SHA1 Съобщение Дата
  Shan9312 42a524bfda 1-优化关闭弹窗2-添加牧场&多牧场选择领用页面 преди 2 седмици
  Shan9312 c0c05d9533 备件申购打包 преди 2 седмици
  Shan9312 645d84363e 备件申购流程新增超级管理员 преди 2 седмици
  Shan9312 7eb9c6d477 申购&合单&赛4 преди 2 седмици
  Shan9312 0f7cd18ae9 修改bug преди 3 седмици
  Shan9312 b3cd80fc6e spa错误字段 преди 3 седмици

+ 2 - 2
.env.development

@@ -11,8 +11,8 @@ ENV = 'development'
 
 
 # 线上测试
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
-# VUE_APP_BASE_API = 'http://10.0.11.178:8082/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+VUE_APP_BASE_API = 'http://192.168.1.233:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'
 

BIN
dist-测试-现代-1101.zip


BIN
dist-测试-现代-1102.zip


BIN
dist-现代-测试-20241105.zip


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/index.html


+ 1 - 0
src/store/getters.js

@@ -6,6 +6,7 @@ const getters = {
   name: state => state.user.name,
   roles: state => state.user.roles,
   buttons: state => state.user.buttons,
+  mainpasture: state => state.user.mainpasture,
   pastureid: state => state.user.pastureid,
   pasturename: state => state.user.pasturename,
   pasturenumber: state => state.user.pasturenumber,

+ 9 - 1
src/store/modules/user.js

@@ -10,6 +10,7 @@ const state = {
   name: '',
   avatar: '',
   pastureid: '',
+  mainpasture:'',
   pasturename: '',
   pasturenumber: '',
   employename: '',
@@ -42,6 +43,10 @@ const mutations = {
     Cookies.set('pastureid', pastureid)
     state.pastureid = pastureid
   },
+  SET_MAINPASTURE: (state, mainpasture) => {
+    Cookies.set('mainpasture', mainpasture)
+    state.mainpasture = mainpasture
+  },
   SET_PASTURENAME: (state, pasturename) => {
     Cookies.set('pasturename', pasturename)
     state.pasturename = pasturename
@@ -173,6 +178,7 @@ const actions = {
               Cookies.remove('employename')
               Cookies.remove('employeid')
               Cookies.remove('pastureid')
+              Cookies.remove('mainpasture')
               removeToken()
               resetRouter()
               resolve()
@@ -202,7 +208,9 @@ const actions = {
 
         GetDataByName({ 'name': 'findByUserPastureName', 'parammaps': { 'jwt_username': username }}).then(response => {
           if (response.data.list.length > 0) {
+            console.log(response.data.list[0],'99999999====')
             commit('SET_PASTUREID', response.data.list[0].pastureId)
+            commit('SET_MAINPASTURE', response.data.list[0].mainpasture)
             commit('SET_PASTURENAME', response.data.list[0].pastureName)
             commit('SET_PASTURENUMBER', response.data.list[0].pastureNumber)
             commit('SET_EMPLOYEID', response.data.list[0].employeId)
@@ -212,7 +220,7 @@ const actions = {
             commit('SET_DEPIDS', response.data.list[0].depIds)
             Cookies.set('gempid', response.data.list[0].employeId)
             Cookies.set('gdepartmentname', response.data.list[0].departmentName)
-
+            Cookies.set('mainpasture', response.data.list[0].mainpasture)
             Cookies.set('gshebquanx','0')
             // 接口判断是不是设备主管权限
             GetDataByName({ 'name': 'getIsDirectorOfEquipment', 'parammaps': { 'empId': response.data.list[0].employeId }}).then(response => {

+ 16 - 3
src/views/console/user/index.vue

@@ -2,6 +2,19 @@
   <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
+        <el-select
+          v-model="getdataListParm.parammaps.pastureName"
+          placeholder="牧场"
+          style="width:120px"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in findAllPasture"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.roleName" placeholder="角色" style="width: 140px;" class="filter-item" />
@@ -202,6 +215,7 @@ export default {
   directives: { waves },
   data() {
     return {
+      findAllPasture: [],
       myHeight:document.documentElement.clientHeight - 85- 200,
       isUserDelete:[],isUserResetpassword:[],isUserEdit:[],isUserRole:[],isUserAdd:[],
       tableKey: 0,
@@ -216,7 +230,7 @@ export default {
         { name: 'getEmpall', offset: 0, pagecount: 0, params: [] },
         { name: 'getMaintenanceTypeList', offset: 0, pagecount: 0, params: [] },
         { name: 'getMcsAccounts', offset: 0, pagecount: 0, params: [] },
-
+        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }}
       ],
       requestFilterParams: { returntype: 'Map', parammaps: {}},
       UpdateDataRelationParam: { name: '', dataname: '', datavalue: '', valuename: '', values: [] },
@@ -294,9 +308,8 @@ export default {
         this.rolelist = response.data.getRoleall.list
         this.emplist = response.data.getEmpall.list
         this.repairmanTypeList = response.data.getMaintenanceTypeList.list
-
         this.viedoAccountList = response.data.getMcsAccounts.list
-
+        this.findAllPasture = response.data.findAllPasture.list
 
         GetDataByName(this.getdataListParm).then(response => {
           this.list = response.data.list

+ 29 - 13
src/views/custom/outStock/index.vue

@@ -6,10 +6,8 @@
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="备件出库" name="first">
-        <!-- <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="handleDescription"  /> -->
         <div class="el-icon-info" style="font-size: 30px;float: right;color: #409EFF;" @click="handleDescription" />
         <div class="filter-container">
-          <!-- @change="changePastureName" -->
           <el-select v-model="getdataListParm.parammaps.pastureArr" style="width: 220px;" placeholder="牧场" class="filter-item" multiple
               collapse-tags  collapse-tags-tooltip  >
             <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
@@ -21,9 +19,6 @@
           <el-select v-model="getdataListParm.parammaps.departmentId" style="width: 140px;" placeholder="领用部门" class="filter-item" clearable>
             <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <!-- <el-select v-model="getdataListParm.parammaps.easStatus" style="width: 150px;" clearable placeholder="EAS同步状态" class="filter-item">
-            <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select> -->
           <el-select v-model="getdataListParm.parammaps.sapStatus" style="width: 150px;" clearable placeholder="SAP上传状态" class="filter-item">
             <el-option v-for="item in easStatus.sapStatusList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
@@ -143,7 +138,8 @@
       </el-tab-pane>
       <el-tab-pane label="出库记录" name="second">
         <div class="filter-container">
-          <el-select v-model="getdataListParm2.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item">
+          <el-select v-model="getdataListParm2.parammaps.pastureArr" multiple
+              collapse-tags  collapse-tags-tooltip   style="width: 220px;" placeholder="牧场" class="filter-item">
             <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
           <el-input v-model="getdataListParm2.parammaps.useForm" placeholder="出库单号" style="width: 200px;" class="filter-item" />
@@ -1125,6 +1121,7 @@ export default {
   data() {
     return {
       numList: [], // 青贮出库订单号
+      parueidIndex: '', // 当前赛场的id
       myHeight: document.documentElement.clientHeight - 85 - 250,
       isSap: 1,
       isSrm: 1,
@@ -1259,7 +1256,8 @@ export default {
           useForm: '',
           useType: '',
           easStatus: '',
-          sapStatus: ''
+          sapStatus: '',
+          pastureArr:[],
         }
       },
       list: [],
@@ -1285,7 +1283,8 @@ export default {
           providerId: '',
           pastureName: Cookies.get('pasturename'),
           assetCode: '',
-          eqName: ''
+          eqName: '',
+          pastureArr:[],
         }
       },
       requestParam: {
@@ -1473,15 +1472,14 @@ export default {
     })
     this.get_select_list()
     this.getTypeList()
-    // 获取订单号
-    this.getNumberArr()
+
   },
 
   methods: {
     // 获取订单号数据
-    async getNumberArr() {
+    async getNumberArr(id) {
       const params = {
-        pastureId: Cookies.get('pastureid')
+        pastureId: id
       }
       const data = await getNumList(params)
       this.numList = data.data
@@ -1691,6 +1689,10 @@ export default {
         })
         this.get_table_data()
         this.getDepartDownList()
+
+        this.parueidIndex = response.data.findAllMainPasture.list[0].id || Cookies.get('pastureid')
+        // 获取订单号
+        this.getNumberArr(this.parueidIndex)
       })
     },
     getDepartDownList() {
@@ -1721,8 +1723,21 @@ export default {
     },
     changePasture(item) {
       this.getDepartParam.parammaps.pastureId = item
+      this.requestUseForm.parammaps.pastureId = item
       this.edit = 1
       this.getCreateDepartDownList()
+      const arr = [
+        { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': item } },
+        // { name: 'findAllDepart', offset: 0, pagecount: 0, parammaps: { 'pastureId': item }},
+      ]
+      GetDataByNames(arr).then(response => {
+        console.log('下拉框数据', response.data)
+        this.findAllEmploye = response.data.findAllEmploye.list
+        // this.findAllDepart = response.data.findAllDepart.list
+      })
+      // 获取订单号
+      this.getNumberArr(item)
+      this.getNumber()
     },
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
@@ -1792,7 +1807,7 @@ export default {
         console.log(arr2,ids2,'999999')
         this.getdataListParm2.parammaps.pastureId = ids2.toString();
      }
-
+     this.getdataListParm2.parammaps.departmentId = this.getdataListParm2.parammaps.departmentId.toString();
       GetDataByName(this.getdataListParm2).then(response => {
         this.list2 = response.data.list
         this.pageNum2 = response.data.pageNum
@@ -1947,6 +1962,7 @@ export default {
       })
       this.getCreateNumber()
     },
+
     getCreateNumber() {
       GetDataByName(this.getParmCreateNumber).then(response => {
         this.$nextTick(() => {

+ 1 - 0
src/views/custom/purchase/index.vue

@@ -680,6 +680,7 @@
               </template>
             </el-table-column>
             <el-table-column label="srm错误" prop="srmError" min-width="110px" align="center" />
+              <el-table-column label="sap错误" prop="sapError" min-width="110px" align="center" />
             <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
                 <el-button v-if="isPurchaseSee" type="primary" size="mini" @click="form_see2(row)">查看</el-button>

+ 21 - 4
src/views/custom/receive/index.vue

@@ -5,7 +5,8 @@
       <el-progress style="padding-left: 10px;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
     </div>
     <div class="filter-container">
-      <el-select v-model="getdataListParm.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item" @change="changePastureName">
+      <el-select v-model="getdataListParm.parammaps.pastureArr" style="width: 220px;" placeholder="牧场"  multiple
+        collapse-tags collapse-tags-tooltip  class="filter-item" @change="changePastureName">
         <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       <el-input v-model="getdataListParm.parammaps.applyCode" clearable placeholder="领用单号" style="width: 200px;" class="filter-item" />
@@ -548,7 +549,7 @@ export default {
       myHeight:document.documentElement.clientHeight - 85- 250,
       findAllPasture: [], findAllDepart: [], findAllEmploye: [], createDepartList: [], edit: 0,
       requestParams: [
-        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
+        { name: 'findAllMainPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
         { name: 'findAllDepart', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid') }},
         { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid') }}
       ],
@@ -575,7 +576,7 @@ export default {
       radioAll: '全部',
       getdataListParm: {
         name: 'getBigpartapplyList', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
-        parammaps: { pastureName: Cookies.get('pasturename'), applyCode: this.$route.query.applyCode, applyType: '', statue: '', departmentId: '', inputDatetime: '', startTime: '', stopTime: '', loginId: Cookies.get('employeid'), menu: 'Receive', logindeptId: Cookies.get('departmentid'), loginpastureId: Cookies.get('pastureid') }
+        parammaps: { pastureName: Cookies.get('pasturename'), applyCode: this.$route.query.applyCode, applyType: '', pastureArr:[], statue: '', departmentId: '', inputDatetime: '', startTime: '', stopTime: '', loginId: Cookies.get('employeid'), menu: 'Receive', logindeptId: Cookies.get('departmentid'), loginpastureId: Cookies.get('pastureid') }
       },
       tableKey: 0,
       listLoading: true,
@@ -770,6 +771,19 @@ export default {
         this.getdataListParm.parammaps.startTime = ''
         this.getdataListParm.parammaps.stopTime = ''
       }
+
+      // 对于多选的牧场,根据数组的名称来转换 pastureArr =》 pastureId TODO:
+      if (this.getdataListParm.parammaps.pastureArr && this.getdataListParm.parammaps.pastureArr.length > 0) {
+        const arr = this.findAllPasture.filter((item) => {
+          if (this.getdataListParm.parammaps.pastureArr.includes(item.name)) {
+            return item
+          }
+        })
+        const ids = arr.map((child) => { return child.id })
+        console.log(arr,ids,'999999')
+        this.getdataListParm.parammaps.pastureId = ids.toString();
+      }
+
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list !== null) {
           console.log('table数据', response.data.list)
@@ -1318,8 +1332,11 @@ export default {
     },
     get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
-        this.findAllPasture = response.data.findAllPasture.list
+        this.findAllPasture = response.data.findAllMainPasture.list
         this.findAllEmploye = response.data.findAllEmploye.list
+        this.getdataListParm.parammaps.pastureArr = this.findAllPasture.map(item => {
+          return item.name
+        })
         this.getDepartDownList()
       })
     },

+ 24 - 8
src/views/custom/storage/index.vue

@@ -13,7 +13,7 @@
           </el-select>
           <el-input v-model="getdataListParm.parammaps.laidCode" placeholder="入库单号" style="width: 200px;" class="filter-item" />
           <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-          <el-select v-model="getdataListParm.parammaps.laidType" clearable placeholder="入库方式" class="filter-item" style="width: 120px;">
+          <el-select v-model="getdataListParm.parammaps.laidType" clearable placeholder="入库方式" class="filter-item" style="width: 120px;" >
             <el-option v-for="item in laidTypes" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <!-- <el-select v-model="getdataListParm.parammaps.easStatus" style="width: 150px;" clearable placeholder="EAS同步状态" class="filter-item">
@@ -255,8 +255,11 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="牧场:" prop="pastureId">
-                <el-select v-model="storage.pastureId" placeholder="牧场" class="filter-item" style="width:100%">
-                  <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.id" />
+                <el-select v-model="storage.pastureId" placeholder="牧场" class="filter-item" style="width:100%" @change="handleChageOrder">
+                  <el-option v-for="item in findAllPasture"
+                   :key="item.id"
+                   :label="item.name"
+                   :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -887,8 +890,9 @@ export default {
         laidType: 0,
         providerId: '',
         storageTime: parseTime(new Date(), '{y}-{m}-{d}'),
-        empId: this.$store.state.user.employeid,
-        pastureId: this.$store.state.user.pastureid
+        empId: this.$store.state.user.employeid ||  Cookies.get('employeid'),
+        pastureId: this.$store.state.user.pastureid ||  Cookies.get('pastureid'),
+        departmentId: Cookies.get('departmentid'),
       },
       TotalAmount: 0,
       orderPart: {},
@@ -1290,14 +1294,26 @@ export default {
       this.storage.laidCode = ''
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
-      this.storage.pastureId = Cookies.get('pastureid')
-      this.storage.employeId = Cookies.get('employeid')
-      console.log(this.storage)
+      this.storage.pastureId = Number(Cookies.get('pastureid'))
+      this.storage.pastureName = Cookies.get('pasturename')
+      this.storage.employeId = Number(Cookies.get('employeid'))
+      console.log(this.storage.pastureId ,'666')
       this.$nextTick(() => {
         this.$refs['temp'].clearValidate()
       })
       this.getCreateNumber()
     },
+    handleChageOrder(val) {
+      const arr = [
+        { name: 'findAllProviderByCt', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': val } },
+        { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': val } },
+      ]
+      GetDataByNames(arr).then(response => {
+        console.log('下拉框数据', response.data)
+        this.findAllProvider = response.data.findAllProviderByCt.list
+        this.findAllEmploye = response.data.findAllEmploye.list
+      })
+    },
     getCreateNumber() {
       GetDataByName(this.getParmCreateNumber).then(response => {
         this.$nextTick(() => {

Файловите разлики са ограничени, защото са твърде много
+ 535 - 533
src/views/custom/subscribe/index.vue


Някои файлове не бяха показани, защото твърде много файлове са промени