调整页面展示

pages/mes/prodReport/components/dModelList.vue

@@ -30,13 +30,13 @@
 					},
 					{
 						name: 'toolCode',
-						label: '工装夹具sn码',
+						label: '刀模版sn码',
 						width: 140,
 					},
 
 					{
 						name: 'toolName',
-						label: '工装夹具名称',
+						label: '刀模版名称',
 						width: 140,
 					},
 					{

pages/mes/prodReport/index.vue

 <style lang="scss">
-.prod-body {
+	.prod-body {
 		//display: flex;
 		height: 100%;
 		//overflow: hidden;
 
 		display: grid;
 		grid-template-columns: 1fr 150px;
-}
+	}
 
-.prod-body-left {
+	.prod-body-left {
 		//flex-grow: 1;
 		// padding: 10rpx;
 		overflow: hidden;
@@ -24,7 +24,7 @@
 				margin: 10rpx 20rpx;
 			}
 
-    .workstation{
+			.workstation {
 				display: inline-block;
 			}
 
@@ -63,9 +63,9 @@
 				border: 1px solid rgb(232, 232, 232);
 			}
 		}
-}
+	}
 
-.prod-body-right {
+	.prod-body-right {
 		width: 300rpx;
 		padding: 10rpx;
 		overflow: auto;
@@ -76,28 +76,27 @@
 			margin: 20rpx 10rpx;
 			font-size: 40rpx;
 		}
-}
+	}
 </style>
 
 <template>
 	<view class="commonBody">
 		<view class="prod-body">
 			<view class="prod-body-left">
-<!--        <view class="prod-body-left-btns">-->
-<!--          <view class="workstation">-->
-<!--            工作站名称：-->
-<!--            {{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}-->
-<!--            &lt;!&ndash;            <u-icon name="edit-pen-fill" size="46" color="#2979ff"></u-icon>&ndash;&gt;-->
-<!--          </view>-->
-<!--          <u-button type="primary" @click="changeWorkstation">切换工作站</u-button>-->
-<!--          &lt;!&ndash;                  <u-button type="primary" @click="commonClick('')">生产任务</u-button>&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <u-button type="primary" @click="commonClick('KnifeTemp')">刀模上架</u-button>&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <u-button type="primary" @click="commonClick('')">生产投料</u-button>&ndash;&gt;-->
-<!--        </view>-->
+				<!--        <view class="prod-body-left-btns">-->
+				<!--          <view class="workstation">-->
+				<!--            工作站名称：-->
+				<!--            {{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}-->
+				<!--            &lt;!&ndash;            <u-icon name="edit-pen-fill" size="46" color="#2979ff"></u-icon>&ndash;&gt;-->
+				<!--          </view>-->
+				<!--          <u-button type="primary" @click="changeWorkstation">切换工作站</u-button>-->
+				<!--          &lt;!&ndash;                  <u-button type="primary" @click="commonClick('')">生产任务</u-button>&ndash;&gt;-->
+				<!--          &lt;!&ndash;                  <u-button type="primary" @click="commonClick('KnifeTemp')">刀模上架</u-button>&ndash;&gt;-->
+				<!--          &lt;!&ndash;                  <u-button type="primary" @click="commonClick('')">生产投料</u-button>&ndash;&gt;-->
+				<!--        </view>-->
 
 				<view class="prod-body-left-task">
-          <zb-table :columns="tableColumn" :stripe="true" @rowClick="rowClick"
-		  @numclik = "numclik"
+					<zb-table :columns="tableColumn" :stripe="true" @rowClick="rowClick" @numclik="numclik"
 						@toggleRowSelection="toggleRowSelection" @toggleAllSelection="toggleAllSelection" :border="true"
 						:data="tableData"></zb-table>
 				</view>
@@ -119,8 +118,8 @@
 								</u-col>
 								<u-col span="4">
 									<u-form-item label="物料条码" label-width="150">
-                    <SearchInput v-model="materialRecordInfo.materialBatchNumber" placeholder="请输入物料条码"
-                                 hassearchbtn="true" @inputchange="search"/>
+										<SearchInput v-model="materialRecordInfo.materialBatchNumber"
+											placeholder="请输入物料条码" hassearchbtn="true" @inputchange="search" />
 									</u-form-item>
 								</u-col>
 								<u-col span="2">
@@ -129,7 +128,8 @@
 									</u-form-item>
 								</u-col>
 								<u-col span="1">
-                  <u-button type="primary" size="mini" @click="commonClick('MaterialUsageRecord')">添加</u-button>
+									<u-button type="primary" size="mini"
+										@click="commonClick('MaterialUsageRecord')">添加</u-button>
 								</u-col>
 								<!--                <u-col span="1">-->
 								<!--                  <u-button type="primary" @click="commonClick('')">删除</u-button>-->
@@ -141,15 +141,18 @@
 								</u-col>
 							</u-row>
 						</u-form>
-            <zb-table :columns="bomFeeColumn" :stripe="true" :border="true" :data="materialUsageRecordList"></zb-table>
+						<zb-table :columns="bomFeeColumn" :stripe="true" :border="true"
+							:data="materialUsageRecordList"></zb-table>
 					</view>
 				</view>
 			</view>
 			<view class="prod-body-right">
-        <view style="text-align: center;line-height: 80rpx;font-size: 28rpx;font-weight: 600;"> {{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}</view>
+				<view style="text-align: center;line-height: 80rpx;font-size: 28rpx;font-weight: 600;">
+					{{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}
+				</view>
 				<u-button type="primary" @click="changeWorkstation">切换工作站</u-button>
-        <br/>
-        <u-button type="warning" @click="commonClick('KnifeTemp')">刀模上架</u-button>
+				<br />
+				<u-button type="warning" @click="commonClick('KnifeTemp')">刀模版上下机</u-button>
 				<u-button type="primary" @click="commonClick('Refresh')">刷新</u-button>
 				<u-button type="success" @click="commonClick('StartTask')">开始作业</u-button>
 				<u-button type="warning" @click="commonClick('StopTask')">暂停作业</u-button>
@@ -212,7 +215,7 @@
 		</u-modal>
 
 
-    <u-modal title="刀模版上架" @confirm="knifeTemp()" show-cancel-button
+		<u-modal title="刀模版上下机" @confirm="knifeTemp()" show-cancel-button
 			:title-style="{'background-color':'#1E3770','color': '#FFFFFF' ,'line-height': '37px','padding-top': '0px'}"
 			v-model="knifeTempVisible" width="1300rpx">
 			<u-form label-width="130px" :model="knifeTempSearch" :rules="rules">
@@ -239,10 +242,7 @@
 			v-model="stopReasonVisible" width="1300rpx">
 			<u-form label-width="100px" :model="feedback" :rules="rules">
 				<u-form-item label="故障类型" prop="quantity">
-          <uni-data-select
-              :localdata="stopReasonList"
-              @change="stopReasonChange"
-          ></uni-data-select>
+					<uni-data-select :localdata="stopReasonList" @change="stopReasonChange"></uni-data-select>
 				</u-form-item>
 				<u-form-item label="故障原因" prop="nickName">
 					<u-input type="textarea" height="150" :border="true" v-model="stopReason"></u-input>
@@ -253,11 +253,14 @@
 </template>
 
 <script>
-import SearchInput from "@/components/ScanInput/index.vue";
-import dModelList from './components/dModelList.vue'
-export default {
+	import SearchInput from "@/components/ScanInput/index.vue";
+	import dModelList from './components/dModelList.vue'
+	export default {
 		name: "ProdReport",
-  components: {SearchInput, dModelList},
+		components: {
+			SearchInput,
+			dModelList
+		},
 		data() {
 			return {
 				screenHeight: 768,
@@ -285,10 +288,18 @@ export default {
 					locationTypeDescNameCode: '',
 					locationTypeDescNameCode2: ''
 				},
-      stopReasonList: [
-        {value: '中午休息吃饭。', text: "休息吃饭"},
-        {value: '刀头模具到期更换，更换期间。', text: "刀头模具到期更换"},
-        {value: '没料了，正在领料', text: "领料加仓"}
+				stopReasonList: [{
+						value: '中午休息吃饭。',
+						text: "休息吃饭"
+					},
+					{
+						value: '刀头模具到期更换，更换期间。',
+						text: "刀头模具到期更换"
+					},
+					{
+						value: '没料了，正在领料',
+						text: "领料加仓"
+					}
 				],
 				stopReason: '',
 				stopReasonVisible: false,
@@ -299,8 +310,7 @@ export default {
 						trigger: "blur"
 					}]
 				},
-      typeList: [
-        {
+				typeList: [{
 						name: '物料扣减'
 					},
 					{
@@ -317,8 +327,7 @@ export default {
 				curTaskInfo: {},
 				currentType: 0,
 				bomFeeData: [],
-      bomFeeColumn: [
-        {
+				bomFeeColumn: [{
 						type: 'selection',
 						width: 35
 					},
@@ -354,8 +363,7 @@ export default {
 						label: '物料描述',
 					}
 				],
-      tableColumn: [
-        {
+				tableColumn: [{
 						type: 'selection',
 						width: 35
 					},
@@ -363,13 +371,13 @@ export default {
 						name: 'arrangeCode',
 						label: '编排单号',
 						width: 140,
-		  func:"numclik"
+						func: "numclik"
 					},
 					{
 						name: 'startTime',
 						label: '计划开始时间',
 						width: 140,
-		  func:"numclik"
+						func: "numclik"
 					},
 					{
 						name: 'endTime',
@@ -487,7 +495,7 @@ export default {
 			uni.$off('taskStatusChanged');
 		},
 		methods: {
-	  numclik(...arg){
+			numclik(...arg) {
 				console.log('99999999', arg)
 			},
 			changeWorkstation() {
@@ -561,7 +569,9 @@ export default {
 			},
 			// 新增刀模版上下机记录
 			async addDModelRecord(params) {
-		const {data} = await this.$u.api.dModel.getToolsByProcessIdAndArrangeCode(params)
+				const {
+					data
+				} = await this.$u.api.dModel.getToolsByProcessIdAndArrangeCode(params)
 				if (data?.length) {
 					const [selectData] = this.tableSelectData
 					const ps = {
@@ -623,8 +633,7 @@ export default {
 						if (this.tableData.length > 0) {
 							this.curTaskInfo = this.tableData[0]
 							this.getMaterialUsageRecordList();
-          } else {
-          }
+						} else {}
 					}
 				});
 			},
@@ -676,7 +685,8 @@ export default {
 					if (res.code === 200) {
 						this.form = res.data;
 						this.$u.vuex('vuex_task', res.data);
-          this.form.progress = Math.round((this.form.quantityProduced / this.form.quantity) * 100, 0);
+						this.form.progress = Math.round((this.form.quantityProduced / this.form.quantity) * 100,
+							0);
 					}
 				});
 			},
@@ -765,43 +775,43 @@ export default {
 				this.open = false;
 			}
 		}
-}
+	}
 </script>
 
 <style>
-.commonBody {
+	.commonBody {
 		width: 100%;
 		height: 100%;
 		background-color: #FEFEFF;
 		margin: 0 0;
 		padding: 0 0;
-}
+	}
 
-.content {
+	.content {
 		margin: 10px;
 		display: flex;
-}
+	}
 
-.content_left {
+	.content_left {
 		width: 40%;
-}
+	}
 
-.task_card {
+	.task_card {
 		width: 90%;
 		margin: 5px;
-}
+	}
 
-.uRow {
+	.uRow {
 		margin-top: 5px;
 		margin-bottom: 5px;
-}
+	}
 
-.content_right {
+	.content_right {
 		width: 60%;
 		padding: 10px;
-}
+	}
 
-.feedback-card {
+	.feedback-card {
 		margin: 25rpx;
 		padding: 18rpx;
 		box-sizing: border-box;
@@ -811,9 +821,9 @@ export default {
 		cursor: pointer;
 		transition: box-shadow 0.2s, border-color 0.2s;
 		box-shadow: 0 1px 2px -2px rgba(0, 0, 0, 0.16), 0 3px 6px 0 rgba(0, 0, 0, 0.12), 0 5px 12px 4px rgba(0, 0, 0, 0.09);
-}
+	}
 
-::v-deep .u-form-item {
+	::v-deep .u-form-item {
 		padding: 0px;
-}
+	}
 </style>
\ No newline at end of file