diff --git a/src/views/Gw/productionOrder/ProductionOrder.vue b/src/views/Gw/productionOrder/ProductionOrder.vue
index 828b042..98c1734 100644
--- a/src/views/Gw/productionOrder/ProductionOrder.vue
+++ b/src/views/Gw/productionOrder/ProductionOrder.vue
@@ -181,7 +181,7 @@ const gridOptionsA: any = reactive({
         }
     }
 })
-function formatTime ({ cellValue, row, column }) {
+function formatTime ({ cellValue, row, column }:any) {
     if(cellValue != undefined)
     return dayjs(cellValue).format("YYYY-MM-DD")
 }
diff --git a/src/views/Gw/productionOrder/ProductionOrderForm.vue b/src/views/Gw/productionOrder/ProductionOrderForm.vue
index 31840ee..b463880 100644
--- a/src/views/Gw/productionOrder/ProductionOrderForm.vue
+++ b/src/views/Gw/productionOrder/ProductionOrderForm.vue
@@ -8,38 +8,38 @@
                 </template>
                 <template #default>
 
-                        <!-- <vxe-form-item title="采购方总部编码" field="PurchaserHqCode" span="12">
+                    <!-- <vxe-form-item title="采购方总部编码" field="PurchaserHqCode" span="12">
                             <template #default="params">
                                 <div style="width: 196px;">{{ params.data.PurchaserHqCode }}</div>
                             </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="订单类型" field="IpoType" span="12">
-                            <template #default="params">
+</vxe-form-item>
+<vxe-form-item title="订单类型" field="IpoType" span="12">
+    <template #default="params">
                                 <div style="width: 196px;">
                                     <vxe-select v-model="params.data.IpoType" clearable filterable>
                                         <template v-for="(item) in dictIpoType">
                                             <vxe-option :value="item.key" :label="item.val"></vxe-option>
                                         </template>
-                                    </vxe-select>
-                                </div>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="供应商编码" field="SupplierCode" span="12">
-                            <template #default="params">
+    </vxe-select>
+    </div>
+    </template>
+</vxe-form-item>
+<vxe-form-item title="供应商编码" field="SupplierCode" span="12">
+    <template #default="params">
                                 <div style="width: 196px;">{{ params.data.SupplierCode }}</div>
                             </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="供应商名称" field="SupplierName" span="12">
-                            <template #default="params">
+</vxe-form-item>
+<vxe-form-item title="供应商名称" field="SupplierName" span="12">
+    <template #default="params">
                                 <div style="width: 196px;">{{ params.data.SupplierName }}</div>
                             </template>
-                        </vxe-form-item> -->
-                        <vxe-form-item title="生产订单号" field="IpoNo" span="12">
-                            <template #default="params">
-                                <div style="width: 196px;">{{ params.data.IpoNo }}</div>
-                            </template>
-                        </vxe-form-item>
-                        <!-- <vxe-form-item title="品类编码" field="CategoryCode" span="12">
+</vxe-form-item> -->
+                    <vxe-form-item title="生产订单号" field="IpoNo" span="12">
+                        <template #default="params">
+                            <div style="width: 196px;">{{ params.data.IpoNo }}</div>
+                        </template>
+                    </vxe-form-item>
+                    <!-- <vxe-form-item title="品类编码" field="CategoryCode" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.CategoryCode" clearable filterable>
                                     <template v-for="(item) in dictCategoryCode">
@@ -62,24 +62,26 @@
                                 <div style="width: 196px;">{{ params.data.ScheduleCode }}</div>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="采购订单行项目id" field="PoItemId" span="12">
-                            <template #default="params">
-                                <div style="width: 196px;">{{ params.data.PoItemId }}</div>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="计划开始日期" field="PlanStartDate" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PlanStartDate" type="date" placeholder="请输入计划开始日期"  style="width: 197px;" v-bind:disabled="formTypeA == 'info'"
-                                    clearable @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="计划完成日期" field="PlanFinishDate" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.PlanFinishDate" type="date" placeholder="请输入计划完成日期" style="width: 197px;" v-bind:disabled="formTypeA == 'info'"
-                                    clearable @change="fnChangeA(params)"></vxe-input>
-                            </template>
-                        </vxe-form-item>
-                        <!-- <vxe-form-item title="数据关联类型" field="DateType" span="12">
+                    <vxe-form-item title="采购订单行项目id" field="PoItemId" span="12">
+                        <template #default="params">
+                            <div style="width: 196px;">{{ params.data.PoItemId }}</div>
+                        </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="计划开始日期" field="PlanStartDate" span="12">
+                        <template #default="params">
+                            <vxe-input v-model="params.data.PlanStartDate" type="date" placeholder="请输入计划开始日期"
+                                style="width: 197px;" v-bind:disabled="formTypeA == 'info'" clearable
+                                @change="fnChangeA(params)"></vxe-input>
+                        </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="计划完成日期" field="PlanFinishDate" span="12">
+                        <template #default="params">
+                            <vxe-input v-model="params.data.PlanFinishDate" type="date" placeholder="请输入计划完成日期"
+                                style="width: 197px;" v-bind:disabled="formTypeA == 'info'" clearable
+                                @change="fnChangeA(params)"></vxe-input>
+                        </template>
+                    </vxe-form-item>
+                    <!-- <vxe-form-item title="数据关联类型" field="DateType" span="12">
                             <template #default="params">
                                 <div style="width: 196px;">{{ params.data.DateType }}</div>
                             </template>
@@ -89,54 +91,55 @@
                                 <div style="width: 196px;">{{ params.data.SoItemNo }}</div>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="厂家物料编码" field="MaterialCode" span="12">
-                            <template #default="params">
-                                <vxe-select v-model="params.data.MaterialCode" clearable filterable @change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
-                                    <template v-for="(item) in ipoMats">
-                                        <vxe-option :value="item.key" :label="item.val"></vxe-option>
-                                    </template>
-                                </vxe-select>
-                                <!-- <vxe-input v-model="params.data.MaterialCode" placeholder="请输入"
+                    <vxe-form-item title="厂家物料编码" field="MaterialCode" span="12">
+                        <template #default="params">
+                            <vxe-select v-model="params.data.MaterialCode" clearable filterable
+                                @change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
+                                <template v-for="item in ipoMats">
+                                    <vxe-option :value="item.key" :label="item.val"></vxe-option>
+                                </template>
+                            </vxe-select>
+                            <!-- <vxe-input v-model="params.data.MaterialCode" placeholder="请输入"
                                     clearable @change="fnChangeA(params)"></vxe-input> -->
-                                <!-- <div style="width: 196px;">{{ params.data.MaterialCode }}</div> -->
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="厂家物料名称" field="MaterialName" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.MaterialName" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
-                                    clearable @change="fnChangeA(params)"></vxe-input>
-                                <!-- <div style="width: 196px;">{{ params.data.MaterialName }}</div> -->
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="厂家物资单位" field="MaterialUnit" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.MaterialUnit" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
-                                    clearable @change="fnChangeA(params)"></vxe-input>
-                                <!-- <div style="width: 196px;">{{ params.data.MaterialUnit }}</div> -->
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="厂家物料描述" field="MaterialDesc" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.MaterialDesc" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
-                                    clearable @change="fnChangeA(params)"></vxe-input>
-                                <!-- <div style="width: 196px;">{{ params.data.MaterialDesc }}</div> -->
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="生产数量" field="Amount" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.Amount" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
-                                    clearable @change="fnChangeA(params)"></vxe-input>
-                                <!-- <div style="width: 196px;">{{ params.data.Amount }}</div> -->
-                            </template>
-                        </vxe-form-item>
-                        <vxe-form-item title="计量单位" field="Unit" span="12">
-                            <template #default="params">
-                                <vxe-input v-model="params.data.Unit" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
-                                    clearable @change="fnChangeA(params)"></vxe-input>
-                                <!-- <div style="width: 196px;">{{ params.data.Unit }}</div> -->
-                            </template>
-                        </vxe-form-item>
-                        <!-- <vxe-form-item title="物资id分组" field="ProductIdGrpNo" span="12">
+                            <!-- <div style="width: 196px;">{{ params.data.MaterialCode }}</div> -->
+                        </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="厂家物料名称" field="MaterialName" span="12">
+                        <template #default="params">
+                            <vxe-input v-model="params.data.MaterialName" placeholder="请输入"
+                                v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
+                            <!-- <div style="width: 196px;">{{ params.data.MaterialName }}</div> -->
+                        </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="厂家物资单位" field="MaterialUnit" span="12">
+                        <template #default="params">
+                            <vxe-input v-model="params.data.MaterialUnit" placeholder="请输入"
+                                v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
+                            <!-- <div style="width: 196px;">{{ params.data.MaterialUnit }}</div> -->
+                        </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="厂家物料描述" field="MaterialDesc" span="12">
+                        <template #default="params">
+                            <vxe-input v-model="params.data.MaterialDesc" placeholder="请输入"
+                                v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
+                            <!-- <div style="width: 196px;">{{ params.data.MaterialDesc }}</div> -->
+                        </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="生产数量" field="Amount" span="12">
+                        <template #default="params">
+                            <vxe-input v-model="params.data.Amount" placeholder="请输入"
+                                v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
+                            <!-- <div style="width: 196px;">{{ params.data.Amount }}</div> -->
+                        </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="计量单位" field="Unit" span="12">
+                        <template #default="params">
+                            <vxe-input v-model="params.data.Unit" placeholder="请输入"
+                                v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
+                            <!-- <div style="width: 196px;">{{ params.data.Unit }}</div> -->
+                        </template>
+                    </vxe-form-item>
+                    <!-- <vxe-form-item title="物资id分组" field="ProductIdGrpNo" span="12">
                             <template #default="params">
                                 <div style="width: 196px;">{{ params.data.ProductIdGrpNo }}</div>
                             </template>
@@ -151,8 +154,8 @@
                                 <div style="width: 196px;">{{ params.data.ProductModel }}</div>
                             </template>
                         </vxe-form-item> -->
-                       
-                        <!-- <vxe-form-item title="实际开始日期" field="ActualStartDate " span="12">
+
+                    <!-- <vxe-form-item title="实际开始日期" field="ActualStartDate " span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.ActualStartDate" type="date" placeholder="请输入实际开始日期"
                                     clearable @change="fnChangeA(params)"></vxe-input>
@@ -164,7 +167,7 @@
                                     clearable @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item> -->
-                        <!-- <vxe-form-item title="生产工厂名称" field="PlantName " span="12">
+                    <!-- <vxe-form-item title="生产工厂名称" field="PlantName " span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.PlantName" placeholder="请输入生产工厂名称" clearable
                                     @change="fnChangeA(params)"></vxe-input>
@@ -197,7 +200,7 @@
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item> -->
-                        <!-- <vxe-form-item title="生产中心" field="Center" span="12">
+                    <!-- <vxe-form-item title="生产中心" field="Center" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.Center" placeholder="请输入生产中心" clearable
                                     @change="fnChangeA(params)"></vxe-input>
@@ -239,7 +242,7 @@
                         <vxe-button type="submit" status="primary" content="保存"></vxe-button>
                         <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
                     </template>
-                    
+
                 </template>
             </vxe-modal>
         </vxe-form>
@@ -274,15 +277,15 @@ const formDataA: any = ref(
         "SupplierIpoId": 0,
         "PurchaserHqCode": 'SGCC',
         "IpoType": "",
-        "CategoryCode":"",
+        "CategoryCode": "",
         "SupplierCode": "1000032215",
         "ModelCode": "",
         "MaterialCode": "",
         "MaterialName": "",
         "MaterialDesc": "",
-        "MaterialUnit":"",
-        "Amount":"",
-        "Unit":"",
+        "MaterialUnit": "",
+        "Amount": "",
+        "Unit": "",
         "SupplierName": "长江电气集团股份有限公司",
         "IpoNo": "",
         "PlanStartDate": "",
@@ -334,11 +337,11 @@ const formRulesA: any = ref({
         { required: true, message: '请输入计划完成日期' }
     ],
 })
-const baseMats = ref([])
-const ipoMats = ref([])
+const baseMats: any = ref([])
+const ipoMats: any = ref([])
 // 挂载
 onMounted(() => {
-    
+
 })
 // 打开弹窗
 const open = async (type: string, row?: any) => {
@@ -346,18 +349,18 @@ const open = async (type: string, row?: any) => {
     console.log(row)
 
     const filterReq = {
-                "filter": {
-                    "field": "MatNo",
-                    "operator": "1",
-                    "value": null
-                }
-            }
-    baseMats.value =await BaseMaterialApi.GetBaseMaterialList(filterReq)
+        "filter": {
+            "field": "MatNo",
+            "operator": "1",
+            "value": null
+        }
+    }
+    baseMats.value = await BaseMaterialApi.GetBaseMaterialList(filterReq)
 
     ipoMats.value = []
-    baseMats.value.Data.forEach( (item) => {
-        if(ipoMats.value.indexOf(item.MatNo)==-1)
-        ipoMats.value.push({key:item.MatNo,val:item.MatNo})
+    baseMats.value.Data.forEach((item: any) => {
+        if (ipoMats.value.indexOf(item.MatNo) == -1)
+            ipoMats.value.push({ key: item.MatNo, val: item.MatNo })
 
     })
 
@@ -413,12 +416,11 @@ const open = async (type: string, row?: any) => {
 }
 // 提供open方法打开弹窗
 defineExpose({ open })
-const fnMatCodeChange =  (params: any) => {
+const fnMatCodeChange = (params: any) => {
     if (params.data.MaterialCode) {
 
-        baseMats.value.Data.forEach( (item) => {
-            if(item.MatNo == params.data.MaterialCode)
-            {
+        baseMats.value.Data.forEach((item: any) => {
+            if (item.MatNo == params.data.MaterialCode) {
                 params.data.MaterialName = item.MatName;
                 params.data.MaterialUnit = item.MatUnit;
                 params.data.MaterialDesc = item.MatDescption;
diff --git a/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue b/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue
index c032183..ca474a5 100644
--- a/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue
+++ b/src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue
@@ -52,26 +52,26 @@ const xGrid = ref()
 
 const gridOptionsA: any = reactive({
     columns: [
-        { field: 'BuyerName', title: '采购方公司名称', fixed: 'left', width: '190px'},
-        { field: 'WoNo', title: '生产工单编码',fixed: 'left', width: '190px' },
-        { field: 'Amount', title: '生产数量', fixed: 'left', width: '190px'},
-        { field: 'PoItemId', title: '采购订单行项目id', width: '190px'},
-        { field: 'IpoNo', title: '生产订单号', width: '190px'},
+        { field: 'BuyerName', title: '采购方公司名称', fixed: 'left', width: '190px' },
+        { field: 'WoNo', title: '生产工单编码', fixed: 'left', width: '190px' },
+        { field: 'Amount', title: '生产数量', fixed: 'left', width: '190px' },
+        { field: 'PoItemId', title: '采购订单行项目id', width: '190px' },
+        { field: 'IpoNo', title: '生产订单号', width: '190px' },
 
-        { field: 'EntityCode', title: '实物ID ',  width: '240px' },
-        { field: 'FactoryNo', title: '出厂编号 ',  width: '240px' },
-      
-        { field: 'MaterialsCode', title: '厂家物料编码',  width: '160px' },
-        { field: 'MaterialsDesc', title: '厂家物料描述',  width: '160px' },
-        { field: 'Unit', title: '计量单位',  width: '160px' },
-        { field: 'PlanStartDate', title: '计划开始日期',  width: '160px',formatter:formatTime },
-        { field: 'PlanFinishDate', title: '计划完成日期',  width: '160px',formatter:formatTime },
-        { field: 'ActualStartDate', title: '实际开始日期',  width: '160px' ,formatter:formatTime},
-        { field: 'ActualFinishDate', title: '实际完成日期',  width: '160px',formatter:formatTime },
+        { field: 'EntityCode', title: '实物ID ', width: '240px' },
+        { field: 'FactoryNo', title: '出厂编号 ', width: '240px' },
+
+        { field: 'MaterialsCode', title: '厂家物料编码', width: '160px' },
+        { field: 'MaterialsDesc', title: '厂家物料描述', width: '160px' },
+        { field: 'Unit', title: '计量单位', width: '160px' },
+        { field: 'PlanStartDate', title: '计划开始日期', width: '160px', formatter: formatTime },
+        { field: 'PlanFinishDate', title: '计划完成日期', width: '160px', formatter: formatTime },
+        { field: 'ActualStartDate', title: '实际开始日期', width: '160px', formatter: formatTime },
+        { field: 'ActualFinishDate', title: '实际完成日期', width: '160px', formatter: formatTime },
         //{ field: 'WoStatus', title: '工单状态',  width: '160px' },
-       
-       
-        { field: 'VoltageLevel', title: '电压等级',  width: '160px' },
+
+
+        { field: 'VoltageLevel', title: '电压等级', width: '160px' },
         { title: '操作', width: 160, fixed: 'right', slots: { default: 'operate' } }
     ],
     pagerConfig: {
@@ -179,9 +179,9 @@ const gridOptionsA: any = reactive({
         }
     }
 })
-function formatTime ({ cellValue, row, column }) {
-    if(cellValue != undefined)
-    return dayjs(cellValue).format("YYYY-MM-DD")
+function formatTime({ cellValue, row, column }: any) {
+    if (cellValue != undefined)
+        return dayjs(cellValue).format("YYYY-MM-DD")
 }
 // 代理重新加载
 const proxyReload = () => {
diff --git a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
index f1b9a10..223a239 100644
--- a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
+++ b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
@@ -11,7 +11,7 @@
                         <vxe-form-item title="生产工单编号" field="WoNo" span="12">
                             <template #default="params">
                                 <!-- <div style="width: 196px;">{{ params.data.WoNo }}</div> -->
-                                <vxe-input v-model="params.data.WoNo"  disabled style="width:240px;"></vxe-input>
+                                <vxe-input v-model="params.data.WoNo" disabled style="width:240px;"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="生产订单编号" field="IpoNo" span="12">
@@ -22,10 +22,11 @@
                         </vxe-form-item>
                         <vxe-form-item title="实物ID" field="EntityCode" span="12">
                             <template #default="params">
-                                <vxe-select v-model="params.data.EntityCode" style="width:240px;" clearable filterable  v-bind:disabled="formTypeA == 'info'">
-                                <template v-for="(item) in ipoEntityIds">
-                                    <vxe-option :value="item.key" :label="item.val"></vxe-option>
-                                </template>
+                                <vxe-select v-model="params.data.EntityCode" style="width:240px;" clearable filterable
+                                    v-bind:disabled="formTypeA == 'info'">
+                                    <template v-for="(item) in ipoEntityIds">
+                                        <vxe-option :value="item.key" :label="item.val"></vxe-option>
+                                    </template>
                                 </vxe-select>
                             </template>
                         </vxe-form-item>
@@ -47,7 +48,7 @@
                                 @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item> -->
-                       
+
                         <!-- <vxe-form-item title="品类编码" field="CategoryCode" span="12">
                             <template #default="params">
                                 <vxe-select v-model="params.data.CategoryCode" clearable filterable>
@@ -71,17 +72,18 @@
                                 <!-- <div style="width: 196px;">{{ params.data.MaterialsCode }}</div> -->
                                 <!-- <vxe-input v-model="params.data.MaterialsCode" placeholder="请输入厂家物料编码" clearable style="width:240px;"
                                     @change="fnChangeA(params)"></vxe-input> -->
-                                <vxe-select v-model="params.data.MaterialsCode" style="width:240px;" clearable filterable @change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
-                                <template v-for="(item) in ipoMats">
-                                    <vxe-option :value="item.key" :label="item.val"></vxe-option>
-                                </template>
+                                <vxe-select v-model="params.data.MaterialsCode" style="width:240px;" clearable
+                                    filterable @change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
+                                    <template v-for="(item) in ipoMats">
+                                        <vxe-option :value="item.key" :label="item.val"></vxe-option>
+                                    </template>
                                 </vxe-select>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="厂家物料描述" field="MaterialsDesc" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.MaterialsDesc" placeholder="请输入厂家物料描述" clearable style="width:240px;"
-                                    @change="fnChangeA(params)"></vxe-input>
+                                <vxe-input v-model="params.data.MaterialsDesc" placeholder="请输入厂家物料描述" clearable
+                                    style="width:240px;" @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="物料批次" field="MaterialsBatch " span="12">
@@ -92,38 +94,39 @@
                         </vxe-form-item> -->
                         <vxe-form-item title="生产数量" field="Amount" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.Amount" placeholder="请输入生产数量" clearable style="width:240px;" disabled></vxe-input>
+                                <vxe-input v-model="params.data.Amount" placeholder="请输入生产数量" clearable
+                                    style="width:240px;" disabled></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="计量单位" field="Unit" span="12">
                             <template #default="params">
                                 <!-- <div style="width: 196px;">{{ params.data.Unit }}</div> -->
-                                <vxe-input v-model="params.data.Unit" placeholder="请输入计量单位" clearable style="width:240px;"
-                                    @change="fnChangeA(params)"></vxe-input>
+                                <vxe-input v-model="params.data.Unit" placeholder="请输入计量单位" clearable
+                                    style="width:240px;" @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="计划开始日期" field="PlanStartDate" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.PlanStartDate" placeholder="请输入计划开始日期" clearable style="width:240px;"
-                                    @change="fnChangeA(params)" type="date"></vxe-input>
+                                <vxe-input v-model="params.data.PlanStartDate" placeholder="请输入计划开始日期" clearable
+                                    style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="计划结束日期" field="PlanFinishDate" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.PlanFinishDate" placeholder="请输入计划结束日期" clearable style="width:240px;"
-                                    @change="fnChangeA(params)" type="date"></vxe-input>
+                                <vxe-input v-model="params.data.PlanFinishDate" placeholder="请输入计划结束日期" clearable
+                                    style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="实际开始日期" field="ActualStartDate" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.ActualStartDate" placeholder="请输入实际开始日期" clearable style="width:240px;"
-                                    @change="fnChangeA(params)" type="date"></vxe-input>
+                                <vxe-input v-model="params.data.ActualStartDate" placeholder="请输入实际开始日期" clearable
+                                    style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="实际完成日期" field="ActualFinishDate" span="12">
                             <template #default="params">
-                                <vxe-input v-model="params.data.ActualFinishDate" placeholder="请输入实际完成日期" clearable style="width:240px;"
-                                    @change="fnChangeA(params)" type="date"></vxe-input>
+                                <vxe-input v-model="params.data.ActualFinishDate" placeholder="请输入实际完成日期" clearable
+                                    style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="工单状态" field="WoStatus" span="12">
@@ -135,16 +138,17 @@
                                 </vxe-select>
                             </template>
                         </vxe-form-item>
-                       
+
                         <vxe-form-item title="电压等级" field="VoltageLevel" span="12">
                             <template #default="params">
                                 <!-- <vxe-input v-model="params.data.VoltageLevel" placeholder="请输入电压等级" clearable style="width:240px;"
                                     @change="fnChangeA(params)"></vxe-input> -->
-                                    <vxe-select v-model="params.data.VoltageLevel" style="width:240px;" clearable filterable v-bind:disabled="formTypeA == 'info'">
-                                        <template v-for="(item) in ipoVoltages">
-                                            <vxe-option :value="item.key" :label="item.val"></vxe-option>
-                                        </template>
-                                    </vxe-select>
+                                <vxe-select v-model="params.data.VoltageLevel" style="width:240px;" clearable filterable
+                                    v-bind:disabled="formTypeA == 'info'">
+                                    <template v-for="(item) in ipoVoltages">
+                                        <vxe-option :value="item.key" :label="item.val"></vxe-option>
+                                    </template>
+                                </vxe-select>
                             </template>
                         </vxe-form-item>
                         <!-- <vxe-form-item title="工艺路线编码" field="ProcessRouteNo " span="12">
@@ -271,14 +275,14 @@ const formRulesA: any = ref({
         { required: true, message: '请输入工单状态' }
     ],
 })
-const baseMats = ref([])
-const ipoMats = ref([])
+const baseMats: any = ref([])
+const ipoMats: any = ref([])
 
-const baseEntityIds = ref([])
-const ipoEntityIds = ref([])
+const baseEntityIds: any = ref([])
+const ipoEntityIds: any = ref([])
 
-const baseVoltages = ref([])
-const ipoVoltages = ref([])
+const baseVoltages: any = ref([])
+const ipoVoltages: any = ref([])
 // 挂载
 onMounted(() => {
 })
@@ -288,34 +292,34 @@ const open = async (type: string, row?: any) => {
     formTypeA.value = type
 
     //基础物料信息
-    const filterMatReq = {"filter": {"field": "MatNo","operator": "1","value": null}}
-    baseMats.value =await BaseMaterialApi.GetBaseMaterialList(filterMatReq)
+    const filterMatReq = { "filter": { "field": "MatNo", "operator": "1", "value": null } }
+    baseMats.value = await BaseMaterialApi.GetBaseMaterialList(filterMatReq)
 
     ipoMats.value = []
-    baseMats.value.Data.forEach( (item) => {
-        if(ipoMats.value.indexOf(item.MatNo)==-1)
-        ipoMats.value.push({key:item.MatNo,val:item.MatNo})
+    baseMats.value.Data.forEach((item: any) => {
+        if (ipoMats.value.indexOf(item.MatNo) == -1)
+            ipoMats.value.push({ key: item.MatNo, val: item.MatNo })
 
     })
 
     //基础实物ID信息
     //const filterEntityReq = {"filter": {"field": "entity_id","operator": "1","value": null}}
-    baseEntityIds.value =await BaseEntityIDApi.GetPoUnUsedEntityID()
+    baseEntityIds.value = await BaseEntityIDApi.GetPoUnUsedEntityID()
 
     ipoEntityIds.value = []
-    baseEntityIds.value.forEach( (item) => {
-        if(ipoEntityIds.value.indexOf(item.EntityId)==-1)
-        ipoEntityIds.value.push({key:item.EntityId,val:item.EntityId})
+    baseEntityIds.value.forEach((item: any) => {
+        if (ipoEntityIds.value.indexOf(item.EntityId) == -1)
+            ipoEntityIds.value.push({ key: item.EntityId, val: item.EntityId })
 
     })
     //基础电压信息
-    const filterVoltageReq = {"filter": {"field": "voltage","operator": "1","value": null}}
-    baseVoltages.value =await BaseVoltageApi.GetBaseVoltageList(filterVoltageReq)
+    const filterVoltageReq = { "filter": { "field": "voltage", "operator": "1", "value": null } }
+    baseVoltages.value = await BaseVoltageApi.GetBaseVoltageList(filterVoltageReq)
 
     ipoVoltages.value = []
-    baseVoltages.value.Data.forEach( (item) => {
-        if(ipoVoltages.value.indexOf(item.Voltage+item.Level)==-1)
-        ipoVoltages.value.push({key:item.Voltage+item.Level,val:item.Voltage+item.Level})
+    baseVoltages.value.Data.forEach((item: any) => {
+        if (ipoVoltages.value.indexOf(item.Voltage + item.Level) == -1)
+            ipoVoltages.value.push({ key: item.Voltage + item.Level, val: item.Voltage + item.Level })
 
     })
 
@@ -367,12 +371,11 @@ const open = async (type: string, row?: any) => {
             break;
     }
 }
-const fnMatCodeChange =  (params: any) => {
+const fnMatCodeChange = (params: any) => {
     if (params.data.MaterialsCode) {
 
-        baseMats.value.Data.forEach( (item) => {
-            if(item.MatNo == params.data.MaterialsCode)
-            {
+        baseMats.value.Data.forEach((item: any) => {
+            if (item.MatNo == params.data.MaterialsCode) {
                 params.data.Unit = item.MatUnit;
                 params.data.MaterialsDesc = item.MatDescption;
             }
@@ -410,10 +413,10 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
-    if(formDataA.value.ActualStartDate==undefined || formDataA.value.ActualStartDate==""){
+    if (formDataA.value.ActualStartDate == undefined || formDataA.value.ActualStartDate == "") {
         formDataA.value.ActualStartDate = null
     }
-    if(formDataA.value.ActualFinishDate==undefined || formDataA.value.ActualFinishDate==""){
+    if (formDataA.value.ActualFinishDate == undefined || formDataA.value.ActualFinishDate == "") {
         formDataA.value.ActualFinishDate = null
     }