修改bug

.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/'
 

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" />
@@ -1259,7 +1255,8 @@ export default {
           useForm: '',
           useType: '',
           easStatus: '',
-          sapStatus: ''
+          sapStatus: '',
+          pastureArr:[],
         }
       },
       list: [],
@@ -1285,7 +1282,8 @@ export default {
           providerId: '',
           pastureName: Cookies.get('pasturename'),
           assetCode: '',
-          eqName: ''
+          eqName: '',
+          pastureArr:[],
         }
       },
       requestParam: {
@@ -1723,6 +1721,15 @@ export default {
       this.getDepartParam.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
+      })
     },
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
@@ -1792,7 +1799,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 +1954,7 @@ export default {
       })
       this.getCreateNumber()
     },
+
     getCreateNumber() {
       GetDataByName(this.getParmCreateNumber).then(response => {
         this.$nextTick(() => {

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,7 +255,7 @@
             </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-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"
@@ -1303,6 +1303,17 @@ export default {
       })
       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(() => {