ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -1,6 +1,7 @@

			<template>
			<view-grid ref="grid"
			<view-grid
			ref="grid"
			:columns="columns"
			:detail="detail"
			:editFormFields="editFormFields"
			@@ -8,7 +9,8 @@
			:searchFormFields="searchFormFields"
			:searchFormOptions="searchFormOptions"
			:table="table"
			:extend="extend">
			:extend="extend"
			>
			</view-grid>
			</template>
			<script>
			@@ -17,12 +19,12 @@
			export default defineComponent({
			setup() {
			const table = ref({
			key: 'id',
			key: "id",
			footer: "Foots",
			cnName: 'åºåºå',
			name: 'DeliveryOrder',
			cnName: "åºåºå",
			name: "DeliveryOrder",
			url: "/DeliveryOrder/",
			sortName: "id"
			sortName: "id",
			});

			const editFormFields = ref({
			@@ -33,6 +35,7 @@
			warehouse_no: "",
			account_time: "",
			outStatus: "",
			locationCode: "",
			});

			const editFormOptions = ref([
			@@ -42,7 +45,7 @@
			field: "out_no",
			type: "string",
			required: true,
			width: 150
			width: 150,
			},
			{
			title: "åºåºåç±»å",
			@@ -51,22 +54,22 @@
			dataKey: "out_type",
			data: [],
			required: true,
			width: 120
			}
			width: 120,
			},
			],
			[
			{
			title: "å®¢æ·ä»£ç ",
			field: "client_no",
			type: "string",
			width: 120
			width: 120,
			},
			{
			title: "å®¢æ·åç§°",
			field: "client_name",
			type: "string",
			width: 150
			}
			width: 150,
			},
			],
			[
			{
			@@ -75,7 +78,7 @@
			type: "select",
			dataKey: "warehouseNuber",
			data: [],
			width: 100
			width: 100,
			},
			{
			title: "ç¶æ",
			@@ -83,17 +86,9 @@
			type: "string",
			dataKey: "outStatus",
			data: [],
			width: 120
			}
			width: 120,
			},
			],
			[
			{
			title: "åºåºè®°è´¦æ¶é´",
			field: "account_time",
			type: "datetime",
			width: 160
			}
			]
			]);

			const searchFormFields = ref({
			@@ -110,7 +105,13 @@
			[
			{ title: "åºåºåå·", field: "out_no", type: "like" },
			{ title: "å®¢æ·ä»£ç ", field: "client_no", type: "like" },
			{ title: "åºæ¿å·", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
			{
			title: "åºæ¿å·",
			field: "warehouse_no",
			type: "select",
			dataKey: "warehouseNuber",
			data: [],
			},
			{
			title: "åºåºåç±»å",
			field: "out_type",
			@@ -129,74 +130,74 @@
			// },
			{ title: "å®¢æ·åç§°", field: "client_name", type: "like" },
			{ title: "åºåºè®°è´¦æ¶é´", field: "account_time", type: "datetime" },
			]
			],
			]);

			const columns = ref([
			{
			field: 'id',
			title: 'ä¸»é®',
			type: 'int',
			field: "id",
			title: "ä¸»é®",
			type: "int",
			width: 90,
			hidden: true,
			readonly: true,
			require: true,
			align: 'left'
			align: "left",
			},
			{
			field: 'out_no',
			title: 'åºåºåå·',
			type: 'string',
			field: "out_no",
			title: "åºåºåå·",
			type: "string",
			width: 150,
			require: true,
			align: 'left',
			align: "left",
			sort: true,
			link: true
			link: true,
			},
			{
			field: 'out_type',
			title: 'åºåºåç±»å',
			type: 'string',
			field: "out_type",
			title: "åºåºåç±»å",
			type: "string",
			width: 120,
			require: true,
			align: 'left',
			bind: { key: "out_type", data: [] }
			align: "left",
			bind: { key: "out_type", data: [] },
			},
			{
			field: 'client_no',
			title: 'å®¢æ·ä»£ç ',
			type: 'string',
			field: "client_no",
			title: "å®¢æ·ä»£ç ",
			type: "string",
			width: 120,
			align: 'left'
			align: "left",
			},
			{
			field: 'client_name',
			title: 'å®¢æ·åç§°',
			type: 'string',
			field: "client_name",
			title: "å®¢æ·åç§°",
			type: "string",
			width: 150,
			align: 'left'
			align: "left",
			},
			{
			field: 'warehouse_no',
			title: 'åºæ¿å·',
			type: 'string',
			field: "warehouse_no",
			title: "åºæ¿å·",
			type: "string",
			width: 100,
			align: 'left',
			bind: { key: "warehouseNuber", data: [] }
			align: "left",
			bind: { key: "warehouseNuber", data: [] },
			},
			{
			field: 'account_time',
			title: 'åºåºè®°è´¦æ¶é´',
			type: 'datetime',
			field: "account_time",
			title: "åºåºè®°è´¦æ¶é´",
			type: "datetime",
			width: 160,
			align: 'left'
			align: "left",
			},
			{
			field: 'outStatus',
			title: 'ç¶æ',
			type: 'string',
			field: "outStatus",
			title: "ç¶æ",
			type: "string",
			width: 120,
			align: 'left',
			align: "left",
			// bind: { key: "outStatus", data: [] }
			// edit:{type:""}
			},
			@@ -208,12 +209,12 @@
			// align: 'left'
			// },
			{
			field: 'createDate',
			title: 'åå»ºæ¶é´',
			type: 'datetime',
			field: "createDate",
			title: "åå»ºæ¶é´",
			type: "datetime",
			width: 160,
			align: 'left',
			sort: true
			align: "left",
			sort: true,
			},
			// {
			// field: 'modifier',
			@@ -223,13 +224,13 @@
			// align: 'left'
			// },
			{
			field: 'modifyDate',
			title: 'ä¿®æ¹æ¶é´',
			type: 'datetime',
			field: "modifyDate",
			title: "ä¿®æ¹æ¶é´",
			type: "datetime",
			width: 160,
			align: 'left',
			sort: true
			}
			align: "left",
			sort: true,
			},
			]);

			const detail = ref({
			@@ -238,34 +239,33 @@
			url: "/DeliveryOrderDetail/",
			columns: [
			{
			field: 'id',
			title: 'ä¸»é®',
			type: 'int',
			field: "id",
			title: "ä¸»é®",
			type: "int",
			width: 90,
			hidden: true,
			readonly: true,
			require: true,
			align: 'left'
			align: "left",
			},
			{
			field: 'deliveryOrderId',
			title: 'å³èåºåºåID',
			type: 'int',
			field: "deliveryOrderId",
			title: "å³èåºåºåID",
			type: "int",
			width: 120,
			require: true,
			align: 'left',
			align: "left",
			sort: true,
			hidden: true
			hidden: true,
			},
			{
			field: 'reservoirarea',
			title: 'åºåº',
			type: 'string',
			field: "reservoirarea",
			title: "åºåº",
			type: "string",
			width: 120,
			align: 'left',
			align: "left",
			bind: { key: "warehouseNuber", data: [] },
			// edit:{type:""}

			hidden: true,
			},
			{
			field: "goods_no",
			@@ -278,100 +278,111 @@
			bind: { key: "MaterielNames", data: [] },
			},
			{
			field: 'goods_no',
			title: 'è¯åç¼ç ',
			type: 'string',
			field: "goods_no",
			title: "è¯åç¼ç ",
			type: "string",
			width: 150,
			require: true,
			align: 'left',
			align: "left",
			bind: { key: "medicineGoods", data: [] },
			// edit:{type:""}
			edit: true,
			},
			{
			field: 'order_qty',
			title: 'è®¢åæ°é',
			type: 'decimal',
			field: "order_qty",
			title: "è®¢åæ°é",
			type: "decimal",
			width: 100,
			require: true,
			align: 'left',
			align: "left",
			// edit:{type:"number"}
			},
			{
			field: 'order_Outqty',
			title: 'å®ææ°é',
			type: 'decimal',
			field: "order_Outqty",
			title: "å®ææ°é",
			type: "decimal",
			width: 100,
			require: true,
			align: 'left',
			edit:{type:"number"}
			align: "left",
			// edit:{type:"number"}
			},
			{
			field: 'batch_num',
			title: 'æ¹å·',
			type: 'string',
			field: "batch_num",
			title: "æ¹å·",
			type: "string",
			width: 120,
			require: true,
			align: 'left',
			edit:{type:""}
			align: "left",
			edit: true,
			},
			{
			field: 'exp_date',
			title: 'æ ¡æ',
			type: 'string',
			field: "exp_date",
			title: "ææ",
			type: "string",
			width: 120,
			align: 'left',
			edit:{type:""}
			},
			{
			field: 'ootDetailStatus',
			title: 'ç¶æ',
			type: 'string',
			width: 120,
			align: 'left',
			align: "left",
			// edit:{type:""}
			},
			{
			field: 'status',
			title: 'åæ¥ç¶æ',
			type: 'int',
			field: "locationCode",
			title: "è´§ä½å·",
			type: "string",
			width: 120,
			align: 'left',
			align: "left",
			hidden: true,
			edit: true,
			},
			{
			field: "ootDetailStatus",
			title: "ç¶æ",
			type: "string",
			width: 120,
			align: "left",
			// edit:{type:""}
			},
			{
			field: "status",
			title: "åæ¥ç¶æ",
			type: "int",
			width: 120,
			align: "left",
			bind: { key: "syncStatus", data: [] },
			// edit:{type:'select',dataKey:'syncStatus',data:[]}
			},
			{
			field: 'creater',
			title: 'åå»ºäºº',
			type: 'string',
			field: "creater",
			title: "åå»ºäºº",
			type: "string",
			width: 90,
			align: 'left'
			align: "left",
			},
			{
			field: 'createDate',
			title: 'åå»ºæ¶é´',
			type: 'datetime',
			field: "createDate",
			title: "åå»ºæ¶é´",
			type: "datetime",
			width: 160,
			align: 'left',
			sort: true
			align: "left",
			sort: true,
			},
			{
			field: 'modifier',
			title: 'ä¿®æ¹äºº',
			type: 'string',
			field: "modifier",
			title: "ä¿®æ¹äºº",
			type: "string",
			width: 100,
			align: 'left'
			align: "left",
			hidden: true,
			},
			{
			field: 'modifyDate',
			title: 'ä¿®æ¹æ¶é´',
			type: 'datetime',
			field: "modifyDate",
			title: "ä¿®æ¹æ¶é´",
			type: "datetime",
			width: 160,
			align: 'left',
			sort: true
			}
			align: "left",
			hidden: true,
			sort: true,
			},
			],
			sortName: "id",
			key: "id"
			key: "id",
			});

			return {