5.26合并

src/views/audit/orderTask/index.vue

@@ -455,6 +455,11 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
+						{
+							width: 80,
+							title: '来源类型',
+							field: 'sourceType',
+						},
 						{
 							width: 130,
 							title: '交货人',
@@ -602,6 +607,11 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
+						{
+							width: 80,
+							title: '来源类型',
+							field: 'sourceType',
+						},
 						{
 							width: 130,
 							title: '交货人',
@@ -746,6 +756,11 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
+						{
+							width: 80,
+							title: '来源类型',
+							field: 'sourceType',
+						},
 						{
 							width: 130,
 							title: '交货人',

src/views/audit/saleOrder/components/orderType.vue

@@ -0,0 +1,51 @@
+<template>
+	<div @click="onChange" class="orderType">
+		{{propValue}}
+		<div class="typeText" v-if="parentValue.isMaster===1" key="master1">拆</div>
+		<div class="typeText typeText2" v-else key="master2">被拆</div>
+	</div>
+</template>
+
+<script lang="ts">
+	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+	@Component
+	export default class OrderType extends Vue {
+		@Prop()
+		propValue : any;
+		@Prop()
+		parentValue : any
+		value : any = '';
+		@Watch('propConfig')
+		propValueChange(v : any) {
+			console.log(v);
+		};
+		onChange(v : any, i : any) {
+			console.log(v, i);
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.orderType {
+		position: relative;
+		color: #0089ff;
+		cursor: pointer;
+		.typeText {
+			position: absolute;
+			top: 8px;
+			right: -6px;
+			width: 40px;
+			height: 18px;
+			line-height: 18px;
+			text-align: center;
+			background-color: #0089ff;
+			border-radius: 12px;
+			color: #fff;
+			font-size: 12px;
+		}
+
+		.typeText2 {
+			background-color: #E6A23C;
+		}
+	}
+</style>

src/views/audit/saleOrder/index.vue

@@ -32,6 +32,7 @@
 <script lang="ts">
 	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 	import api from "@/api/order";
+	import OrderType from "./components/orderType.vue";
 	import byBill from "./components/byBill/byBill.vue";
 	@Component({ components: { byBill } })
 	export default class OrderTask extends Vue {
@@ -302,21 +303,22 @@
 						height: 600,
 						size: 'mini',
 						seq: true,
-						align: 'center',
+						align: 'left',
 						checkbox: true
 					},
 					columns: [
 						{
-							width: 178,
+							width: 190,
 							title: '单据编号',
 							field: 'orderNumber',
-							// component: 'by-input',
+							component: OrderType,
 							// compConfig: {
 							// 	attr: {
 							// 		placeholder: '请输入单据编号',
 							// 		clearable: true
 							// 	}
 							// },
+							align: 'left',
 							isDetail: true,
 						},
 						{