From f2b4fe94d6f2d1c733ca0330f17c8818afcd3836 Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Sat, 18 Sep 2021 16:51:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/retrospect/product/index.vue | 38 +++++++++++++++++++-------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/retrospect/product/index.vue b/src/views/retrospect/product/index.vue
index 8d4c60d..cf236e1 100644
--- a/src/views/retrospect/product/index.vue
+++ b/src/views/retrospect/product/index.vue
@@ -99,12 +99,15 @@
         >导出</el-button>
       </el-form-item>
     </el-form>
-    <div class="table-wrap">
+    <div class="table-wrap" ref="tableHeightRef">
       <el-table
         v-loading="loading"
         :data="tableData"
         @cell-click="cellClick"
         border
+        v-if="tableHeight"
+        :height="tableHeight"
+        highlight-current-row
       >
         <el-table-column
           :label="getColumnName('OM_SerialOrder-SerialOrderId')"
@@ -132,8 +135,8 @@
     </div>
     <div class="details-wrap">
       <p class="details-title">明细过程数据</p>
-      <div class="details-table-wrap">
-        <el-table v-loading="loading" :data="tableDetailsData" border>
+      <div class="details-table-wrap" ref="tableDetailsHeightRef">
+        <el-table v-loading="loading" :data="tableDetailsData" v-if="tableDetailsHeight" :height="tableDetailsHeight" border>
           <el-table-column
             v-for="item in detailsHeaders"
             :key="item"
@@ -173,20 +176,23 @@ export default {
       headers:[],
       tableData:[],
       detailsHeaders:[
-        'SerialOrderOPTrace-PO',
-        'SerialOrderOPTrace-WorkOrderId',
         'SerialOrderOPTrace-ArtId',
-        'SerialOrderOPTrace-RecvData',
+        'SerialOrderOPTrace-WorkOrderId',
         'SerialOrderOPTrace-SerialOrderId',
-        'SerialOrderOPTrace-Status',
-        'SerialOrderOPTrace-StepDesc',
+        'SerialOrderOPTrace-PO',
         'SerialOrderOPTrace-WorkPlaceId',
-        'SerialOrderOPTrace-ExecuteTime',
+        'SerialOrderOPTrace-StepDesc',
+        'SerialOrderOPTrace-RecvData',
+        'SerialOrderOPTrace-Status',
         'SerialOrderOPTrace-Remark1',
+        'SerialOrderOPTrace-ExecuteTime',
+        
       ],
       tableDetailsData:[],
       loading:false,
-      cellItem:{}
+      cellItem:{},
+      tableHeight:0,
+      tableDetailsHeight:0
     }
   },
   created(){
@@ -197,7 +203,19 @@ export default {
     }
     this.getPotrace();
   },
+  mounted(){
+    this.setTableHeight();
+    this.setTableDetailsHeight();
+  },
   methods:{
+    // tableHeight高度
+    setTableHeight(){
+      this.tableHeight = (this.$refs.tableHeightRef.offsetHeight-5) || 400;
+    },
+    // tableHeight高度
+    setTableDetailsHeight(){
+      this.tableDetailsHeight = (this.$refs.tableDetailsHeightRef.offsetHeight-5) || 360;
+    },
     // 导出文件
     exportExcel() {
       exportheadexcel(this.formData).then((res) => {

From f0019ed05d1df96460f2d6a2bed3153dd7595778 Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Mon, 27 Sep 2021 10:34:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/productplan/base.js                   |  16 ++
 .../workbench/order/closeOrder.vue            | 165 ++++++++++++++++++
 .../workbench/{order.vue => order/index.vue}  |  31 +++-
 3 files changed, 206 insertions(+), 6 deletions(-)
 create mode 100644 src/views/productplan/workbench/order/closeOrder.vue
 rename src/views/productplan/workbench/{order.vue => order/index.vue} (96%)

diff --git a/src/api/productplan/base.js b/src/api/productplan/base.js
index dc91515..870430e 100644
--- a/src/api/productplan/base.js
+++ b/src/api/productplan/base.js
@@ -189,6 +189,22 @@ export function getSerialOrder (query) {
 		params: query
 	})
 }
+// 未完成工单列表 
+export function getUncomplete (params) {
+	return request({
+		url: '/admin/om/workorder/getuncomplete',
+		method: 'get',
+		params
+	})
+}
+// 取消未完成工单 
+export function cancelUncomplete (data) {
+	return request({
+		url: '/admin/om/workorder/canceluncomplete',
+		method: 'post',
+		data
+	})
+}
 // 返工列表查询
 export function queryDefectRecord (query) {
 	return request({
diff --git a/src/views/productplan/workbench/order/closeOrder.vue b/src/views/productplan/workbench/order/closeOrder.vue
new file mode 100644
index 0000000..19b6734
--- /dev/null
+++ b/src/views/productplan/workbench/order/closeOrder.vue
@@ -0,0 +1,165 @@
+<template>
+  <el-dialog title="明细" visible width="90%" :close-on-click-modal="false">
+			<el-table
+        :data="tableData"
+        border
+        tooltip-effect="dark"
+        height="410"
+        ref="multipleTable"
+        class="order-table-content-wrap"
+        @select="handleSelectionChange"
+      >
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+				<el-table-column v-for="item in headers" :key="item" :label="getColumnName(item)" :show-overflow-tooltip="true" align="center">
+					<template slot-scope="scope">
+						<div v-if="item === 'OM_SerialOrder-SerialOrderStatus'"
+						:class="['bg-div',{'not-plan-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 10},
+						{'has-plan-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 20},
+						{'has-lock-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 24},
+						{'has-issued-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 26},
+						{'interrupt-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 39},
+						{'in-production-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 40},
+						{'has-complete-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 80},
+						{'has-shipment-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 90},
+						{'freeze-bg': scope.row[item]['OM_SerialOrderStatus-Status'] == 95},
+						{'has-cancel-bg': scope.row[item]['OM_SerialOrderStatus-Status'] == 98}]"> {{ fieldTrans(scope.row[item]['OM_SerialOrderStatus-Status']) }} </div>
+						<span v-else>{{ scope.row[item] }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column
+					v-for="(item, index) in timeHeaders"
+					:key="index"
+					:label="getColumnName(item)"
+					:show-overflow-tooltip="true"
+					width="170"
+					align="center">
+					<template slot-scope="scope">
+						<span v-if="item === 'OM_SerialOrder-ActEndTime' && scope.row[item] === '19000101000000'"></span>
+						<span v-else>{{ parseTime(scope.row[item]) }}</span>
+					</template>
+				</el-table-column>
+    	</el-table>
+			<div slot="footer" class="dialog-footer">
+        <el-button @click="clearSelect">取消选择</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+		</el-dialog>
+</template>
+<script>
+import {getUncomplete, cancelUncomplete} from '@/api/productplan/base'
+export default {
+  props:{
+    item:{
+      default:{}
+    }
+  },
+  data(){
+    return{
+      tableData:[],
+      headers:[
+        'OM_SerialOrder-WorkOrderId',
+        'OM_SerialOrder-SerialOrderId',
+        'OM_SerialOrder-PlanResourceId',
+        'OM_SerialOrder-UsedResourceId',
+        'OM_SerialOrder-PlanQty',
+        'OM_SerialOrder-ProjectId',
+        'OM_SerialOrder-SerialOrderStatus'
+      ],
+      timeHeaders:[
+        'OM_SerialOrder-PlanStartTime',
+        'OM_SerialOrder-PlanEndTime',
+        'OM_SerialOrder-ActEndTime',
+      ],
+      orderStatusArray: [], // 订单状态
+      selectionValue:[], // 当前选择的工单明细
+    }
+  },
+  methods:{
+    submit(){
+      if(this.selectionValue.length<=0){
+        this.msgError('请选择工单');
+      }else{
+        cancelUncomplete(this.selectionValue.map(e=>e['OM_SerialOrderStatus-SerialOrderId'])).then(({code})=>{
+          if(code==200){
+            this.msgSuccess('取消成功');
+            this.cancel();
+          }
+        })
+      }
+    },
+    // 关闭
+    cancel(){
+      this.$emit('setIsCloseOrder', {});
+    },
+    // 订单状态字段转换
+		fieldTrans(value) {
+			if (this.orderStatusArray.length > 0) {
+				let fieldValue = ''
+				this.orderStatusArray.forEach(el => {
+					if (value === Number(el['stdeftab-stdeftyp'])) {
+						fieldValue = el['stdeftab-bez']
+					}
+				})
+				return fieldValue
+			}
+		},
+    // 数组排序
+    sortby(a,b){return a['OM_SerialOrder-Sort']-b['OM_SerialOrder-Sort']},
+    // 选择后的回调
+    handleSelectionChange(value){
+      if(value.length<=1){
+        this.selectionValue=value;
+      }else{
+        // 清空已有选择
+        this.$refs.multipleTable.clearSelection();
+        // 根据已选中排序
+        const newData=value.sort(this.sortby);
+        // 查找所有符合条件的选项
+        this.selectionValue=this.tableData.filter(e=>{
+          return parseInt(e['OM_SerialOrder-Sort'])>=parseInt(newData[0]['OM_SerialOrder-Sort']) && parseInt(e['OM_SerialOrder-Sort'])<=parseInt(newData[newData.length-1]['OM_SerialOrder-Sort']);
+        });
+        // 追加选中
+        this.selectionValue.forEach(row => {
+          this.$refs.multipleTable.toggleRowSelection(row);
+        });
+      }
+    },
+    // 取消选择
+    clearSelect(){
+      this.$refs.multipleTable.clearSelection();
+    },
+    // 获取未完成工单明细
+    getUncomplete(){
+      getUncomplete({workOrderId: this.item['OM_WorkOrder-WorkOrderId']}).then(({code, data=[]}) => {
+        this.tableData=(data || []).sort(this.sortby);
+      })
+    },
+    // 获取生产状态
+    getOrderStatus(){
+      this.getStanderOne({ statid: 'WorkOrderStatus' }).then(res => {
+        this.orderStatusArray = res.data
+      })
+    }
+  },
+  mounted(){
+    this.getUncomplete();
+    this.getOrderStatus();
+  }
+}
+</script>
+<style lang="scss">
+  .order-table-content-wrap{
+    .el-table__header-wrapper{
+      .el-table-column--selection{
+        .el-checkbox{
+          display: none;
+        }
+      }
+    }
+  }
+  
+</style>
\ No newline at end of file
diff --git a/src/views/productplan/workbench/order.vue b/src/views/productplan/workbench/order/index.vue
similarity index 96%
rename from src/views/productplan/workbench/order.vue
rename to src/views/productplan/workbench/order/index.vue
index 4a3a873..065ff52 100644
--- a/src/views/productplan/workbench/order.vue
+++ b/src/views/productplan/workbench/order/index.vue
@@ -110,7 +110,7 @@
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="210" fixed="right">
+      <el-table-column label="操作" align="center" width="300" fixed="right">
         <template slot-scope="scope">
 					<el-button
             size="mini"
@@ -120,6 +120,13 @@
           >明细</el-button>
 					<el-button
             size="mini"
+            type="text"
+						:disabled="scope.row['OM_WorkOrderStatus-Status'] < 26 || scope.row['OM_WorkOrderStatus-Status'] > 80"
+            icon="el-icon-s-order"
+            @click="setIsCloseOrder(scope.row)"
+          >取消工单</el-button>
+					<el-button
+            size="mini"
             type="text"
 						:disabled="scope.row['OM_WorkOrderStatus-Status'] >= 80"
             icon="el-icon-s-order"
@@ -354,12 +361,14 @@
       </div>
 		</el-dialog>
 		<InsertOrder v-if="isInsertOrder" @showInsertOrder="showInsertOrder" />
-		<SplistOrder v-if="item['OM_WorkOrder-WorkOrderId']" :item="item"  @setItem="setItem"/>
+		<CloseOrder v-if="isCloseOrder" :item="item"  @setIsCloseOrder="setIsCloseOrder"/>
+		<SplistOrder v-if="!isCloseOrder && item['OM_WorkOrder-WorkOrderId']" :item="item"  @setItem="setItem"/>
   </div>
 </template>
 
 <script>
-import InsertOrder from './insertOrder'
+import InsertOrder from '../insertOrder'
+import CloseOrder from './closeOrder.vue';
 import { 
 	getWorkorderList,
 	getWorkorder,
@@ -378,12 +387,13 @@ import {
 import { getProjectList } from '@/api/system/project'
 import { getWorkshopList } from '@/common/workshop'
 import { deepCopy } from "@/common/timeCycle.js"
-import SplistOrder from './insertOrder/splitOrder.vue'
+import SplistOrder from '../insertOrder/splitOrder.vue'
 import moment from 'moment'
 export default {
 	components:{
 		InsertOrder,
-		SplistOrder
+		SplistOrder,
+		CloseOrder
 	},
   name: 'order',
   data() {
@@ -459,7 +469,8 @@ export default {
 			detailsHeaders: [],
 			detailsTimeHeaders: [],
 			detailsLoading: true,
-			item:{}
+			item:{},
+			isCloseOrder:false, // 是否显示取消工单界面
     }
   },
   created() {
@@ -496,6 +507,14 @@ export default {
 			this.item=item;
 			if(Object.keys(item).length==0){
         this.getList();
+      }
+		},
+		// 是否显示取消工单界面
+		setIsCloseOrder(item){
+			this.isCloseOrder = !this.isCloseOrder;
+			this.item=item;
+			if(Object.keys(item).length==0){
+        this.getList();
       }
 		},
 		// 是否显示排序界面

From 3b60235aa3ac5d01a8c177ef9299f2f51b7d6605 Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Mon, 27 Sep 2021 10:42:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8B=86=E5=8D=95=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productplan/workbench/insertOrder/splitOrder.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/productplan/workbench/insertOrder/splitOrder.vue b/src/views/productplan/workbench/insertOrder/splitOrder.vue
index 12d9cae..3b9d11e 100644
--- a/src/views/productplan/workbench/insertOrder/splitOrder.vue
+++ b/src/views/productplan/workbench/insertOrder/splitOrder.vue
@@ -11,8 +11,8 @@
     <el-form :inline="true" :model="formData" :rules="rules" ref="formRef" class="demo-form-inline">
       <el-row>
         <el-col :span="8">
-          <el-form-item :label="getColumnName('OM_WorkOrder-PlanQty')" prop="OM_WorkOrder-PlanQty">
-            <el-input v-model="formData['OM_WorkOrder-PlanQty']" disabled />
+          <el-form-item :label="getColumnName('OM_WorkOrderQty-PlanQty')" prop="OM_WorkOrderQty-PlanQty">
+            <el-input v-model="formData['OM_WorkOrderQty-PlanQty']" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="拆分数量" prop="qty">
-            <el-input-number :max="formData['OM_WorkOrder-PlanQty']-formData['OM_WorkOrderQty-ReleasedQty']" v-model="formData.qty" placeholder="请输入" />
+            <el-input-number :max="formData['OM_WorkOrderQty-PlanQty']-formData['OM_WorkOrderQty-ReleasedQty']" v-model="formData.qty" placeholder="请输入" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -52,7 +52,7 @@ export default {
     }
   },
   mounted(){
-    this.formData['OM_WorkOrder-PlanQty'] = this.item['OM_WorkOrder-PlanQty'];
+    this.formData['OM_WorkOrderQty-PlanQty'] = this.item['OM_WorkOrderQty-PlanQty'];
     this.formData['OM_WorkOrderQty-ReleasedQty'] = this.item['OM_WorkOrderQty-ReleasedQty']
     this.formData['workOrderId'] = this.item['OM_WorkOrder-WorkOrderId'];
   },