From afc3897af8de95aae47ff7dce334a3617256748a Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 17 三月 2026 16:03:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheShenKu
---
项目代码/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue | 157 +++++++++++++++++++++++++++-------------------------
1 files changed, 81 insertions(+), 76 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue"
index dd6b227..6ef6c8b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.vue"
@@ -5,89 +5,94 @@
*涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_OutOrder.js姝ゅ缂栧啓
-->
<template>
- <view-grid ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend">
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
<script>
- import extend from "@/extension/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '娑傝宸ュ崟',
- name: 'Orderinfo/Dt_PaintingOrderInfo',
- url: "/Dt_PaintingOrderInfo/",
- sortName: "Id"
- });
- const editFormFields = ref({
- "orderNumber":"",
- "status":"",
- "orderDate":"",
- "warehouseId":"",
- "upperOutOrderId":"",
- "remarks":"",
+import extend from "@/extension/widesea_wms/OrderInfo/Dt_PaintingOrderInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '娑傝宸ュ崟',
+ name: 'Orderinfo/Dt_PaintingOrderInfo',
+ url: "/Dt_PaintingOrderInfo/",
+ sortName: "Id"
+ });
+ const editFormFields = ref({
+ "orderNumber": "",
+ "status": "",
+ "orderDate": "",
+ "warehouseId": "",
+ "upperOutOrderId": "",
+ "remarks": "",
- });
- const editFormOptions = ref([
- ]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([
+ });
+ const editFormOptions = ref([
+ ]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([
[
{ "title": "宸ュ崟鍙�", "field": "workOrderNo", "type": "text" },
{ "title": "pvi", "field": "pvi", "type": "text" },
+ { "title": "宸ュ崟绫诲瀷", "field": "workOrderType", "type": "select", dataKey: "OrderType", data: [] },
{ "title": "鍑哄簱鏃ユ湡", "field": "orderDate", "type": "datetime" },
+ ], [
+ { "title": "鐧借溅韬墿鏂欏彿", "field": "biwMaterial", "type": "text" },
+ { "title": "褰╄溅韬墿鏂欏彿", "field": "pbMaterial", "type": "text" },
+ { "title": "杞﹀瀷鐗瑰緛鍊�", "field": "vehicleCharacteristic", "type": "string" },
+ { "title": "澶╃獥鐗瑰緛鍊�", "field": "skylightCharacteristic", "type": "string" },
+ ], [
+ { "title": "杞﹁韩棰滆壊", "field": "carBodyCharacteristic", "type": "text" },
+ { "title": "鍙岃壊杞﹁韩", "field": "twoToneCharacteristic", "type": "text" },
+ { "title": "宸ュ崟椤哄簭鍙�", "field": "sequenceNo", "type": "string" },
+ { "title": "CTC閰嶇疆", "field": "config1", "type": "string" },
],
- ]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'plantCode',title:'宸ュ巶',type:'string',width:100,require:true,align:'left'},
- //{field:'workshopCode',title:'杞﹂棿',type:'string',width:70,require:true,align:'left'},
- //{field:'splitStrategy',title:'鐢熶骇妯″紡',type:'string',width:110,require:true,align:'left'},
- {field:'workOrderNo',title:'宸ュ崟鍙�',type:'string',width:220,require:true,align:'left'},
- {field:'workOrderType',title:'宸ュ崟绫诲瀷',type:'string',width:110,require:true,align:'left',bind: { key: "OrderType", data: []}},
- {field:'pvi',title:'pvi',type:'string',width:100,require:true,align:'left'},
- {field:'biwMaterial',title:'鐧借溅韬墿鏂欏彿',type:'string',width:120,require:true,align:'left'},
- {field:'vehicleCharacteristic',title:'杞﹀瀷鐗瑰緛鍊�',type:'string',width:100,require:true,align:'left'},
- {field:'skylightCharacteristic',title:'澶╃獥鐗瑰緛鍊�',type:'string',width:100,require:true,align:'left'},
- {field:'carBodyCharacteristic',title:'杞﹁韩棰滆壊',type:'string',width:100,require:true,align:'left'},
- {field:'twoToneCharacteristic',title:'鍙岃壊杞﹁韩',type:'string',width:100,require:true,align:'left'},
- {field:'sequenceNo',title:'宸ュ崟椤哄簭鍙�',type:'string',width:90,require:true,align:'left'},
- {field:'config1',title:'CTC閰嶇疆',type:'string',width:110,require:true,align:'left'},
- {field:'pbMaterial',title:'褰╄溅韬墿鏂欏彿',type:'string',width:220,require:true,align:'left'},
- //{field:'config3',title:'澶囩敤3',type:'string',width:110,require:true,align:'left'},
- {field:'workOrderSendStatus',title:'宸ュ崟涓嬪彂鐘舵��',type:'string',width:220,require:true,align:'left'},
- {field:'creater',title:'鍒涘缓浜�',type:'string',sort:true,width:110,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',sort:true,width:150,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',sort:true,width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃堕棿',type:'datetime',sort:true,width:150,align:'left',sort:true},
- ]);
- const detail = ref({
- cnName: "鍑哄簱鏄庣粏璁㈠崟",
- table: "#detailTable",
- columns: [
- ],
- sortName: "id",
- key: "iD"
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
+ ]);
+ const columns = ref([{ field: 'Id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+ { field: 'plantCode', title: '宸ュ巶', type: 'string', width: 100, require: true, align: 'left' },
+ //{field:'workshopCode',title:'杞﹂棿',type:'string',width:70,require:true,align:'left'},
+ //{field:'splitStrategy',title:'鐢熶骇妯″紡',type:'string',width:110,require:true,align:'left'},
+ { field: 'workOrderNo', title: '宸ュ崟鍙�', type: 'string', width: 200, require: true, align: 'left' },
+ { field: 'workOrderType', title: '宸ュ崟绫诲瀷', type: 'string', width: 110, require: true, align: 'left', bind: { key: "OrderType", data: [] } },
+ { field: 'pvi', title: 'pvi', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'biwMaterial', title: '鐧借溅韬墿鏂欏彿', type: 'string', width: 120, require: true, align: 'left' },
+ { field: 'vehicleCharacteristic', title: '杞﹀瀷鐗瑰緛鍊�', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'skylightCharacteristic', title: '澶╃獥鐗瑰緛鍊�', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'carBodyCharacteristic', title: '杞﹁韩棰滆壊', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'twoToneCharacteristic', title: '鍙岃壊杞﹁韩', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'sequenceNo', title: '宸ュ崟椤哄簭鍙�', type: 'string', width: 150, require: true, align: 'left' },
+ { field: 'config1', title: 'CTC閰嶇疆', type: 'string', width: 110, require: true, align: 'left' },
+ { field: 'pbMaterial', title: '褰╄溅韬墿鏂欏彿', type: 'string', width: 220, require: true, align: 'left' },
+ //{field:'config3',title:'澶囩敤3',type:'string',width:110,require:true,align:'left'},
+ { field: 'workOrderSendStatus', title: '宸ュ崟涓嬪彂鐘舵��', type: 'string', width: 120, require: true, align: 'left' },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ ]);
+ const detail = ref({
+ cnName: "鍑哄簱鏄庣粏璁㈠崟",
+ table: "#detailTable",
+ columns: [
+ ],
+ sortName: "id",
+ key: "iD"
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
</script>
--
Gitblit v1.9.3