mes-ocea-before.git

			@@ -65,6 +65,7 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="零件" prop="partId">
			<el-tooltip class="item" effect="dark" :content="partStr" >
			<el-input v-model="partStr" placeholder="" readonly>
			<el-button
			v-if="!this.dataForm.id"
			@@ -73,11 +74,12 @@
			@click="openRoutingDialog()"
			></el-button>
			</el-input>
			</el-tooltip>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="10">
			<el-col :span="3">
			<el-col :span="4">
			<el-form-item label="需求数量" prop="qtyRequired">
			<el-input
			v-model="dataForm.qtyRequired"
			@@ -86,9 +88,10 @@
			></el-input>
			</el-form-item>
			</el-col>
			<el-col :span="3">
			<el-col :span="4">
			<el-form-item label="完成数量" prop="qtyFinished">
			<el-input-number
			style= "width: 90%"
			v-model="dataForm.qtyFinished"
			placeholder=""
			:controls="false"
			@@ -107,7 +110,7 @@
			</el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<!-- <el-col :span="6">
			<el-form-item label="外护颜色" prop="outerColor">
			<el-input
			readonly
			@@ -124,15 +127,16 @@
			placeholder=""
			></el-input>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row :gutter="10">
			<el-col :span="6">
			</el-col> -->
			<el-col :span="5">
			<el-form-item label="备注" prop="remark">
			<el-input v-model="dataForm.remark" placeholder=""></el-input>
			<el-tooltip class="item" effect="dark" :content="dataForm.remark">
			<el-input v-model="dataForm.remark" placeholder="">
			</el-input>
			</el-tooltip>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-col :span="5">
			<el-form-item label="制造属性" prop="manufactureAttr">
			<el-select
			v-model="dataForm.manufactureAttr"
			@@ -150,7 +154,8 @@
			</el-select>
			</el-form-item>
			</el-col>
			<el-col
			</el-row>
			<!-- <el-col
			:span="2"
			v-if="permissions.plan_manufacturingorder_bom_sure"
			>
			@@ -175,8 +180,8 @@
			<el-switch v-model="dataForm.standardConfirmStatus">
			</el-switch>
			</el-form-item>
			</el-col>
			<el-col :span="2">
			</el-col> -->
			<!-- <el-col :span="2">
			<el-form-item
			label="IFS车间订单接收时报告工序"
			prop="isReportOperation"
			@@ -185,7 +190,7 @@
			<el-switch v-model="dataForm.isReportOperation" disabled>
			</el-switch>
			</el-form-item>
			</el-col>
			</el-col> -->
			<!-- <el-col :span="2">
			<el-form-item label="BOM确认">
			<el-switch >
			@@ -204,7 +209,7 @@
			</el-switch>
			</el-form-item>
			</el-col> -->
			</el-row>

			</div>
			<div class="productorder-detail">
			<el-card class="productorder-list">
			@@ -226,15 +231,7 @@
			<el-option
			v-for="item in dataForm.routingList"
			:key="item.id"
			:label="
			item.routingNo +
			'-' +
			item.bomTypeDb +
			'-' +
			item.alternativeNo +
			'-' +
			item.alternativeDesc
			"
			:label="item.routingNo "
			:value="item.id"
			>
			</el-option>
			@@ -260,11 +257,22 @@
			</el-form-item>
			</el-col>
			</el-row>

			<el-row>
			<el-col :span="24" class="productorder-operates-col">
			<el-card class="productorder-operates">
			<el-table
			<el-card class="productorder-operates" >
			<el-row>
			<el-col :span="2" class="frame1">序号
			</el-col>
			<el-col :span="4" class="frame1">工序号
			</el-col>
			<el-col :span="5" class="frame1">工序描述
			</el-col>
			<el-col :span="9" class="frame1">零件
			</el-col>
			<el-col :span="3" class="frame1">操作
			</el-col>
			</el-row>
			<!-- <el-table
			ref="operationTable"
			:data="operations"
			style="width: 100%;"
			@@ -312,10 +320,56 @@
			</el-button>
			</template>
			</el-table-column>
			</el-table>
			</el-table> -->
			<zttdraggable
			:forceFallback="true"
			:list="operations"
			:animation="200"
			fallbackClass="fallbackStyle"
			ghostClass="item_ghost"
			@end="dragEnd"
			>
			<div
			:class="{ dragItem: true, active: x.active }"
			v-for="(x, i) in operations"
			:key="i"
			>
			<!-- <div class="dragBody">
			<div class="info">{{ x.operationNo }}</div>
			<div class="info">{{ x.operationName }}</div>
			<div class="info">{{ x.partName }}</div>
			</div> -->
			<el-row>
			<el-col :span="2" class="frame">{{ i+1 }}
			</el-col>
			<el-col :span="4" class="frame">{{ x.operationNo }}
			</el-col>
			<el-col :span="5" class="frame">{{ x.operationName }}
			</el-col>
			<el-col :span="9" class="frame">{{ x.partName }}
			</el-col>
			<el-col :span="3" class="frame">
			<el-button
			type="text"
			size="mini"
			@click="openOrderOperation(x)"
			>编辑
			</el-button>
			</el-col>
			</el-row>
			</div>
			</zttdraggable>
			</el-card>
			</el-col>
			</el-row>








			</el-col>
			<el-col :span="16">
			<el-tabs type="card" ref="paramTabs">
			@@ -484,7 +538,7 @@
			</el-table>
			</el-card>
			</el-tab-pane>
			<el-tab-pane
			<!-- <el-tab-pane
			label="检测标准"
			key="tb1"
			id="tb1"
			@@ -497,7 +551,7 @@
			:moRoutingOperationId="moRoutingOperationId"
			@refreshTestStandardInfo="refreshTestStandardInfo"
			></testStandardTable>
			</el-tab-pane>
			</el-tab-pane> -->
			<!-- <el-tab-pane
			label="抽检规则"
			key="tb2"
			@@ -698,13 +752,13 @@
			label="单位"
			/>

			<el-table-column
			<!-- <el-table-column
			prop="discNum"
			width="150"
			header-align="center"
			align="center"
			label="盘数(盘)"
			/>
			/> -->

			<!-- <el-table-column
			prop="version"
			@@ -921,7 +975,27 @@
			/>
			</div>
			</template>
			<style>
			<style lang="scss">
			.frame{
			display: flex;
			justify-content: center;
			align-items: center;
			height: 100px;
			// border-width: 1px;
			// border-color: rgb(129, 129, 129);
			// border-style: solid;
			font-size: 15px;
			}
			.frame1{
			display: flex;
			justify-content: center;
			align-items: center;
			height: 50px;
			// border-width: 1px;
			// border-color: rgb(129, 129, 129);
			// border-style: solid;
			font-size: 15px;
			}
			.productorder-basic {
			background-color: #fff;
			height: 150px;
			@@ -960,6 +1034,7 @@
			.productorder-operates {
			height: 605px;
			border: 1px solid #ddd;
			overflow: auto;
			}

			.productorder-params-template {
			@@ -1011,7 +1086,8 @@
			addRoutingTemplateParamLedForOrder,
			updateMoBom,
			delMoBom,
			bomSelectChange
			bomSelectChange,
			changeOrder,
			} from '@/api/plan/manufacturingorder'
			import { qryMoSamplingRule, delMoSamplingRule } from '@/api/plan/mosamplingrule'
			import {
			@@ -1041,7 +1117,7 @@
			import spotCheckRule from './orderSpotCheckRule'
			import spotCheckRuleEdit from './orderSpotCheckRuleEdit'
			import { mapGetters } from 'vuex'

			import zttdraggable from 'vuedraggable'
			export default {
			components: {
			CustomerOrder,
			@@ -1057,7 +1133,8 @@
			operationDialog,
			insertOperationDialog,
			spotCheckRule,
			spotCheckRuleEdit
			spotCheckRuleEdit,
			zttdraggable
			},

			data() {
			@@ -1224,7 +1301,6 @@
			this.getBomTypeDbOptions()
			this.getManufactureAttrs('manufacture_attr_type')
			this.getSysParam(sysParam.IS_REPORT_OPERATION)
			// console.log(this.components);
			},
			watch: {
			'dataForm.partId'(newValue, oldValue) {
			@@ -1239,9 +1315,6 @@
			}
			},
			components(newVal,oldVal){
			console.log("新",newVal);
			console.log("老",oldVal);
			console.log(this.components);
			},
			currentRouting(newValue, oldValue) {
			if (newValue && newValue.id) {
			@@ -1292,7 +1365,6 @@
			if (newValue && newValue.id) {
			// 查询产品结构对应的组件
			getBom(newValue.id).then((response) => {
			console.log("查",this.components);
			// this.components = [response.data.data.tree]
			})
			}
			@@ -1327,6 +1399,28 @@
			}
			},
			methods: {
			dragEnd(e){
			this.operations.forEach((e, i) => {
			e.index = i + 1
			e.operationOrder = i+1
			})
			console.log(this.operations,"拖拽结束kk");
			this.dragEndstart()
			},
			dragEndstart(){
			let data = this.operations.map(el =>{
			return {
			id:el.id,
			operationOrder:el.operationOrder,
			}
			})
			console.log(data,"id");
			changeOrder(data).then((res) =>{
			console.log(res,"回调");
			}).catch(error => {
			console.error(error)
			});
			},
			getSysParam(paramKey) {
			getSysParam(paramKey).then((response) => {
			var paramVal = response.data.data
			@@ -2096,7 +2190,6 @@
			},
			// 新增工序
			addOperation(operation) {
			console.log('operation', operation)
			},
			insertOperation(operation) {},
			structSelectionChange(val) {