修改宝霆前端页面展现bug

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/MaterialMgr.vue

@@ -302,6 +302,7 @@ export default {
       this.loading = true;
       this.queryParams.sort = "updateTime";
       this.queryParams.model = {equId: equId};
+	  this.queryParams.size = 15;
       EquBarrelApi.page(this.queryParams).then(response => {
 
         let res = response.data

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/OrderMgr.vue

@@ -14,15 +14,15 @@
     <el-tabs class="noTabPadding" v-model="activeTab" type="border-card" @tab-click="tabClick">
       <!--      全部-->
       <el-tab-pane name="allOrdersTab" :label="$t('btOrder.all')">
-        <allOrdersTab ref="allOrdersTab"></allOrdersTab>
+        <allOrdersTab ref="allOrdersTab" :resource-id="resourceId"></allOrdersTab>
       </el-tab-pane>
       <!--      待生产-->
       <el-tab-pane name="toBeProduced" :label="$t('btOrder.toBeProduced')">
-        <toBeProducedTab ref="toBeProduced"></toBeProducedTab>
+        <toBeProducedTab ref="toBeProduced" :resource-id="resourceId"></toBeProducedTab>
       </el-tab-pane>
       <!--      待取-->
       <el-tab-pane name="toBeTaken" :label="$t('btOrder.toBeTaken')">
-        <toBeTakenTab ref="toBeProduced"></toBeTakenTab>
+        <toBeTakenTab ref="toBeProduced" :resource-id="resourceId"></toBeTakenTab>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -59,6 +59,7 @@ export default {
     return {
       tenant: this.initTenant(),
       tabNum: {tab1: 0, tab2: 0},
+	  resourceId: '',
       activeTab: "allOrdersTab"  // 默认选择的tab（进行中）
     }
   },
@@ -82,7 +83,7 @@ export default {
     },
   },
   mounted() {
-
+     
   },
   methods: {
     initTenant() {
@@ -112,7 +113,8 @@ export default {
       vm.enums = val['enums']
       if (val['row']) {
         vm.tenant = { ...val['row'] };
-        this.tenant
+        console.log(vm.tenant);
+        vm.resourceId = this.tenant.id		
       }
     },
     close() {
@@ -122,11 +124,11 @@ export default {
       this.queryParams = initQueryParams();
       this.$refs.table.clearSort();
       this.$refs.table.clearFilter();
-      this.search();
+      //this.search();
     },
     tabClick(e) {
       console.log("被选择的tab:", e.index)
-      // 全部-tab
+      // 全部-tab	  
       if (e.index == 0) {
         this.$refs.allOrdersTab.search()
       }

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/allOrders.vue

@@ -164,6 +164,12 @@ export default {
   directives: {elDragDialog},
   components: {Pagination, OrderEdit, OrderImport},
   filters: {},
+  props: {
+      resourceId: {
+        type:String,
+        default:''
+      }
+  },
   data() {
     return {
       statusFilter: [{text: '待支付', value: '1'}, {text: '待生产', value: '2'}, {text: '待取', value: '3'}, {
@@ -239,7 +245,8 @@ export default {
     onSelectChange(selection) {
       this.selection = selection;
     },
-    search() {
+    search() {	  
+	  this.queryParams.model.orderEquId = this.resourceId
       this.fetch({
         ...this.queryParams
       });
@@ -248,7 +255,7 @@ export default {
       this.queryParams = initQueryParams();
       this.$refs.table.clearSort();
       this.$refs.table.clearFilter();
-      this.search();
+      //this.search();
     },
     exportExcelPreview() {
       if (this.queryParams.timeRange) {
@@ -348,6 +355,8 @@ export default {
 
       this.queryParams.current = params.current ? params.current : this.queryParams.current;
       this.queryParams.size = params.size ? params.size : this.queryParams.size;
+	  
+	  this.queryParams.model.orderEquId = this.resourceId
 
       orderApi.page(this.queryParams).then(response => {
         const res = response.data;

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/toBeProduced.vue

@@ -174,6 +174,12 @@ export default {
   components: { Pagination, OrderEdit, OrderImport},
   filters: {
 
+  },
+  props: {
+      resourceId: {
+        type:String,
+        default:''
+      }
   },
   data() {
     return {
@@ -232,6 +238,7 @@ export default {
       this.selection = selection;
     },
     search() {
+	  this.queryParams.model.orderEquId = this.resourceId
       this.fetch({
         ...this.queryParams
       });
@@ -340,6 +347,9 @@ export default {
 
       this.queryParams.current = params.current ? params.current : this.queryParams.current;
       this.queryParams.size = params.size ? params.size : this.queryParams.size;
+	  
+	  this.queryParams.model.orderEquId = this.resourceId
+	  this.queryParams.model.orderStatus = "2"
 
       orderApi.page(this.queryParams).then(response => {
         const res = response.data;

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/toBeTaken.vue

@@ -174,6 +174,12 @@ export default {
   components: { Pagination, OrderEdit, OrderImport},
   filters: {
 
+  },
+  props: {
+      resourceId: {
+        type:String,
+        default:''
+      }
   },
   data() {
     return {
@@ -232,6 +238,7 @@ export default {
       this.selection = selection;
     },
     search() {
+	  this.queryParams.model.orderEquId = this.resourceId
       this.fetch({
         ...this.queryParams
       });
@@ -340,6 +347,9 @@ export default {
 
       this.queryParams.current = params.current ? params.current : this.queryParams.current;
       this.queryParams.size = params.size ? params.size : this.queryParams.size;
+	  
+	  this.queryParams.model.orderEquId = this.resourceId
+	  this.queryParams.model.orderStatus = "3"
 
       orderApi.page(this.queryParams).then(response => {
         const res = response.data;

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/material/cup.vue

@@ -134,13 +134,13 @@
 					<uni-forms class="uni-forms" :modelValue="form">
 						<uni-forms-item class="form-item" label="料筒" name="barrelCode">
 							<!--<text>{{this.form.barrelCode||'空'}}</text>-->
-							<text>{{form.barrelCode}}</text>
+							<text style="line-height: 25px;height:25px;">{{form.barrelCode}}</text>
 						</uni-forms-item>
 						<uni-forms-item class="form-item" label="到期日期" name="date">
 							<uni-datetime-picker type="date" v-model="form.date" />
 						</uni-forms-item>
 						<uni-forms-item class="form-item" label="剩余原料" name="currentMaterial">
-							<text>{{form.mtName||'空'}}</text>
+							<text style="line-height: 25px;height:25px;">{{form.mtName||'空'}}</text>
 						</uni-forms-item>
 						<uni-forms-item class="form-item" label="余量" name="surplus">
 							<uni-number-box :min="0" :max="100" v-model="form.surplus" :disabled="true">