JY02

src/api/jixiaoguanli/baogong.js

@@ -20,4 +20,18 @@ export const getMac = (data) => {
     method: 'get',
     data
   })
+}
+export const remodelGetTab = (data) => {
+  return service({
+    url: '/mes_server/facility/remodelGetTab',
+    method: 'get',
+    data
+  })
+}
+export const setMachineTeam = (data) => {
+  return service({
+    url:'/mes_server/Facility/setMachineTeam',
+    method: 'post',
+    data
+  })
 }

src/view/performance/chejianbaogong.vue

@@ -20,14 +20,14 @@
 		
 		
     <el-container>
-      <el-aside width="200px">
+      <!-- <el-aside width="200px">
         <div class="JKWTree-tree">
 
           <h3  > 车间报工</h3>
           <el-tree :data="treeData" :props="defaultProps" :default-expand-all="true" @node-click="handleNodeClick"></el-tree>
         </div>
 
-      </el-aside>
+      </el-aside> -->
       <el-container>
 <!--        <el-header>dd</el-header>-->
         <el-main>
@@ -824,6 +824,118 @@
 		  </template>
 		</el-dialog>
 		
+		<el-dialog
+		  v-model="huanxingVisible"
+		  title="换型清场"
+		  destroy-on-close
+		  width="1100px"
+		  style="height: 78%;"
+		>
+		  <div style="display: flex;">
+		    <div style="flex: 0.1;">
+		      <el-aside width="180px" style="margin: 0;">
+		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
+		          <el-tree :data="huanxingtreeData" :props="defaultProps" highlight-current="true"
+		            @node-click="huanxingNodeClick"></el-tree>
+		        </div>
+		      </el-aside>
+		    </div>
+		    <div v-if="huanxingstatus" style="flex: 0; margin: 0;">
+		      <el-tabs v-model="activNames" type="card" @tab-click="handleClick">
+		        <el-tab-pane label="指标检验"  @click="showTable('指标检验')"  name="first">
+		          <el-table
+		            tooltip-effect="dark"
+		            :data="zhibiaoselectData"
+		            row-key="ID"
+		            highlight-current-row="true"
+		          				:show-overflow-tooltip="true"
+		            border  @row-click="dianjianhandle"
+		            style="width:100%; height:310px;"
+		            @row-dblclick="handleSelectClick"
+		            :row-class-name="rowClassName"
+		          >
+		            <el-table-column
+		              prop="检验项目"
+		              label="检验项目"
+		              width="270"
+		            />
+					<el-table-column
+					  v-slot="scope"
+					  label="不检测" 
+					  width="70"
+					>
+					   <el-checkbox v-model="scope.row.notjc" @click="notjcClick(scope.row)"></el-checkbox>
+					</el-table-column>
+		            <el-table-column
+		              v-slot="scope"
+		              label="合格"
+		              width="60"
+		            >
+		              
+		             <el-checkbox v-model="scope.row.zc" @click="zcClick(scope.row)"></el-checkbox>
+		            
+		            </el-table-column>
+		            <el-table-column
+		              v-slot="scope"
+		              label="不合格" 
+		              width="70"
+		            >
+		               <el-checkbox v-model="scope.row.yc" @click="ycClick(scope.row)"></el-checkbox>
+		            </el-table-column>
+					<el-table-column
+					  prop="检测方法"
+					  label="检测方法"
+					  width="90"
+					/>
+					<el-table-column
+					  prop="检验频率"
+					  label="检验频率"
+					  width="150"
+					/>
+					<el-table-column
+					  prop="相关标准"
+					  label="相关标准"
+					  width="180"
+					/>
+		          </el-table>
+		        </el-tab-pane>
+		      
+		        <el-tab-pane label="附加检验记录"  @click="showTable('附加检验记录')"  name="second">
+		          <el-table
+		            tooltip-effect="dark"
+		            :data="fujiaselectData"
+		            row-key="ID"
+		            highlight-current-row="true"
+		          				:show-overflow-tooltip="true"
+		            border  @row-click="dianjianhandle"
+		            style="width:100%; height:320px;"
+		            @row-dblclick="handleSelectClick"
+		            :row-class-name="rowClassName"
+		          >
+				    <el-table-column
+				      v-slot="scope"
+				      label="不检测" 
+				      width="75"
+				    >
+				       <el-checkbox v-model="scope.row.notjc"></el-checkbox>
+				    </el-table-column>
+		            <el-table-column
+		              prop="缺陷备注"
+		              label="缺陷及记录"
+		              width="720"
+		            />
+		            <el-table-column
+		              prop="编号"
+		              label="编号"
+		              width="80"
+		            />
+		          </el-table>
+		        </el-tab-pane>
+		      </el-tabs>
+		    </div>
+		  </div>
+		</el-dialog>
+		
 		<el-dialog
 		  v-model="xunchaVisible"
 		  title="管理人员现场巡查记录"
@@ -1440,7 +1552,9 @@ import {
 import {
   ProcessInspectionRecordsItemAdd,
   AdditionalInspectionRecordAdd,
-  getMac
+  getMac,
+  remodelGetTab,
+  setMachineTeam
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -1492,6 +1606,7 @@ const activNames=ref('first')
 let checked3=ref(false)
 const detailData = reactive([])
 const treeData=ref([])
+const huanxingtreeData=ref([])
 const zhichengtreeData=ref([{
 	label: '首件与过程确认'
 },{
@@ -1592,6 +1707,7 @@ const FacilityProduction = async () => {
 	    formData.value.工序名称 = response.data.工序名称;
 	    formData.value.产品名称 = response.data.产品名称;
 		formData.value.machine=JTMC
+		formData.value.状态=response.data.状态
 		BZMC.value=response.data.班组编号
 	       // 填充sczl_bh和sczl_name字段
 		   let sczl_bhkey=''
@@ -1900,6 +2016,7 @@ const onzhicheng = async () => {
 
 const chanliangselectData = reactive([])
 const chanliangVisible = ref(false)
+const huanxingVisible = ref(false)
 const xunchaVisible = ref(false)
 
 //设置机台状态
@@ -1908,6 +2025,24 @@ function onstatus() {
 	 SetMachineStatus()
 	 // ReportProduceInfo()
 }
+function onClear() {
+	huanxingVisible.value=true
+	 RemodelGetTab()
+}
+const RemodelGetTab = async() => {
+  const response = await remodelGetTab()
+  let arr=[]
+  if (response.code === 0) {
+	  Object.keys(response.data).map(item=>{
+	  		  arr.push(response.data)
+	  })
+	  console.log(arr)
+	  huanxingtreeData.value=response.data.map((item)=>({
+		  label:item
+	  }))
+    console.log(huanxingtreeData)
+  }
+}
 //设置机台状态
 const SetMachineStatus = async () => {
   // const response = await setMachineStatus({
@@ -2112,7 +2247,7 @@ const GetMachineMac = async () => {
 	xmlhttp.open("get", "http://127.0.0.1:8090/init")
 	// 5. 发送
 	xmlhttp.send();
-  const response = await getMachineMac({ addr: '68-ED-A4-26-5F-37' });
+  const response = await getMachineMac({ addr: '68-ED-A4-26-5D-5E' });
   console.log(response);
   if (response.code === 0) {
     // 将接口返回的数据添加到树型结构中
@@ -2731,6 +2866,23 @@ const selectBz = async() => {
 		  }
 		  formData.value.class=classbz.value.join(',')
 		}
+		const response = await setMachineTeam({
+			machine: JTMC.split("#")[0],
+			order:formData.value.工单编号,
+			yjno:formData.value.印件号,
+			gy_name:formData.value.工序名称,
+			sczl_bzdh:BZMC.value,
+			status:formData.value.状态,
+			production_now:0,
+			production_all:0,
+			team_id:currentBz.value.ID
+			})
+		if(response.code===0){
+			ElMessage({
+			  type: 'success',
+			  message: '成功'
+			})
+		}
 		currentBz.value={}
 	}
 }