diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue
index eb1a9233..c98c7843 100644
--- a/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue
+++ b/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue
@@ -72,6 +72,7 @@ export default {
                 columnSort: true,
                 tip: false,
                 align: 'center',
+                height:window.innerHeight - 150,
                 calcHeight: 32,
                 simplePage: false,
                 page: false,
@@ -204,6 +205,13 @@ export default {
                         search: false,
                         width: 120,
                     },
+                    {
+                        label: '预出库数量',
+                        prop: 'preOutQty',
+                        search: false,
+                        sortable: 'custom',
+                        width: 120,
+                    },
                     {
                         label:"出库数量",
                         prop: "outQty",
diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue
index 044c9a5b..f4499750 100644
--- a/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue
+++ b/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue
@@ -1,136 +1,50 @@
 <template>
-  <el-dialog
-    :title="rowItem.isBatch ? '批量出库' : '出库'"
-    append-to-body
-    :modelValue="openShow"
-    width="90%"
-    @close="closeDialog"
-    fullscreen
-  >
+  <el-dialog :title="rowItem.isBatch ? '批量出库' : '出库'" append-to-body :modelValue="openShow" width="90%"
+    @close="closeDialog" fullscreen>
     <div style="height: 50px">
-      <el-input
-        v-model="formInline.orderId"
-        placeholder="请扫描流程卡号"
-        @keyup.enter.native="changeCode"
-        style="width: 200px; float: left"
-      ></el-input>
+      <el-input v-model="formInline.orderId" placeholder="请扫描流程卡号" @keyup.enter.native="changeCode"
+        style="width: 200px; float: left"></el-input>
       <el-button type="danger" @click="delFn" style="float: right">删除</el-button>
     </div>
-    <el-form
-      ref="ruleFormRef"
-      style="max-width: 300px"
-      :model="ruleForm"
-      :rules="rules"
-      label-width="auto"
-    >
+    <el-form ref="ruleFormRef" style="max-width: 300px" :model="ruleForm" :rules="rules" label-width="auto">
       <el-form-item label="领用人" prop="picker">
-        <jhSelect
-          v-model="ruleForm.picker"
-          placeholder="请搜索选择"
-          api-url="/blade-system/user/page"
-          echo-api="/blade-system/user/page"
-          echoParamsKey="ids"
-          echo-method="get"
-          api-method="get"
-          list-key="records"
-          total-key="total"
-          label-key="realName"
-          value-key="id"
-          search-key="realName"
-          :debounce-time="500"
-          @change="projectHeadChange"
-          :title="title"
-          :disabled="isDetail"
-        />
+        <jhSelect v-model="ruleForm.picker" placeholder="请搜索选择" api-url="/blade-system/user/page"
+          echo-api="/blade-system/user/page" echoParamsKey="ids" echo-method="get" api-method="get" list-key="records"
+          total-key="total" label-key="realName" value-key="id" search-key="realName" :debounce-time="500"
+          @change="projectHeadChange" :title="title" :disabled="isDetail" />
       </el-form-item>
     </el-form>
 
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      :before-open="beforeOpen"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-      @row-save="rowSave"
-      @cell-click="cellClick"
-    >
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+      @search-change="searchChange" @search-reset="searchReset" :before-open="beforeOpen"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+      @refresh-change="refreshChange" @on-load="onLoad" @row-save="rowSave" @cell-click="cellClick">
       <template #goodsCode="scope">
-        <el-select
-          v-model="scope.row.goodsCode"
-          filterable
-          clearable
-          @change="val => changeGoods(val, scope.index)"
-        >
-          <el-option
-            v-for="item in goodsList"
-            :key="item.id"
-            :label="item.goodsCode"
-            :value="item.goodsCode"
-          ></el-option>
+        <el-select v-model="scope.row.goodsCode" filterable clearable @change="val => changeGoods(val, scope.index)">
+          <el-option v-for="item in goodsList" :key="item.id" :label="item.goodsCode"
+            :value="item.goodsCode"></el-option>
         </el-select>
       </template>
       <template #shId="scope">
-        <el-select
-          v-model="scope.row.shId"
-          @change="val => changeWare(val, scope.index)"
-          filterable
-          clearable
-        >
-          <el-option
-            v-for="item in scope.row.shList"
-            :key="item.id"
-            :label="item.shName"
-            :value="item.id"
-          ></el-option>
+        <el-select v-model="scope.row.shId" @change="val => changeWare(val, scope.index)" filterable clearable>
+          <el-option v-for="item in scope.row.shList" :key="item.id" :label="item.shName" :value="item.id"></el-option>
         </el-select>
       </template>
       <template #slId="scope">
-        <el-select
-          v-model="scope.row.slId"
-          @change="val => changeLocation(val, scope.index)"
-          filterable
-          clearable
-        >
-          <el-option
-            v-for="item in scope.row.slList"
-            :key="item.id"
-            :label="item.location"
-            :value="item.slId"
-          ></el-option>
+        <el-select v-model="scope.row.slId" @change="val => changeLocation(val, scope.index)" filterable clearable>
+          <el-option v-for="item in scope.row.slList" :key="item.id" :label="item.location"
+            :value="item.slId"></el-option>
         </el-select>
       </template>
       <template #piNo="scope">
-        <el-select
-          v-model="scope.row.piNo"
-          @change="val => changePiNo(val, scope.index)"
-          filterable
-          clearable
-        >
-          <el-option
-            v-for="item in scope.row.piNoList"
-            :key="item.id"
-            :label="item.piNo"
-            :value="item.piNo"
-          ></el-option>
+        <el-select v-model="scope.row.piNo" @change="val => changePiNo(val, scope.index)" filterable clearable>
+          <el-option v-for="item in scope.row.piNoList" :key="item.id" :label="item.piNo"
+            :value="item.piNo"></el-option>
         </el-select>
       </template>
       <template #outQty="scope">
-        <el-input-number
-          v-model="scope.row.outQty"
-          :min="1"
-          :max="scope.row.stockQty"
-          style="width: 90%"
-          controls-position="right"
-        ></el-input-number>
+        <el-input-number v-model="scope.row.outQty" :min="1" :max="scope.row.stockQty" style="width: 90%"
+          controls-position="right"></el-input-number>
       </template>
     </avue-crud>
 
@@ -323,6 +237,12 @@ export default {
             prop: 'stockQty',
             width: 120,
           },
+          {
+            label: '预出库数量',
+            prop: 'preOutQty',
+            search: false,
+            width: 120,
+          },
           {
             label: '出库数量',
             prop: 'outQty',
@@ -340,7 +260,7 @@ export default {
       rules: {
         picker: [{ required: true, message: '请选择领用人', trigger: 'change' }],
       },
-      submitLoading:false,
+      submitLoading: false,
     };
   },
   mounted() {
@@ -530,7 +450,7 @@ export default {
         if (validate) {
           // this.closeDialog(this.currentRow);
           this.submitLoading = true;
-         
+
           batchIssue(submitData).then(res => {
             if (res.data.code === 200) {
               this.$message.success('出库成功');
diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue
index 9472496d..cd590e73 100644
--- a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue
+++ b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue
@@ -320,6 +320,14 @@ export default {
             sortable: 'custom',
             width: 120,
           },
+          
+          {
+            label: '预出库数量',
+            prop: 'preOutQty',
+            search: false,
+            sortable: 'custom',
+            width: 120,
+          },
           {
             label: '已出库数量',
             prop: 'outQty',
diff --git a/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/addDialog.vue b/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/addDialog.vue
index eb1a9233..ddd2441d 100644
--- a/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/addDialog.vue
+++ b/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/addDialog.vue
@@ -72,6 +72,7 @@ export default {
                 columnSort: true,
                 tip: false,
                 align: 'center',
+                height: window.innerHeight - 150,
                 calcHeight: 32,
                 simplePage: false,
                 page: false,
@@ -118,96 +119,49 @@ export default {
                     {
                         label: '生产单号',
                         prop: 'yoCode',
-                        width: 150,
-                        search: false,
-                    },
-                    {
-                        label: '零件号',
-                        prop: 'partCode',
-                        width: 150,
-                        search: false,
-                    },
-                    {
-                        label: '零件名称',
-                        prop: 'partName',
-                        width: 150,
                         search: false,
                     },
+                    
                     {
                         label: "流程卡号",
                         prop: "cardNo",
-                        width: 120,
                         search: false,
                     },
+                    
                     {
                         label: "生产数量",
-                        prop: "quantity",
+                        prop: "needQuantity",
                         search: false,
-                        width: 120,
                     },
                     {
                         label: '物料编码',
                         prop: 'goodsCode',
                         search: false,
-                        width:180,
                     },
                     {
                         label: '物料名称',
-                        width:150,
                         prop: 'goodsName',
                         search: false,
                     },
+                    {
+                        label: "齐套数量",
+                        prop: "completeQuantity",
+                        search: false,
+                    },
                     {
                         label: '库房',
                         prop: 'shId',
-                        width:150,
                         search: false,
                     },
                     {
                         label: '库位',
                         prop: 'slId',
-                        width:150,
-                        search: false,
-                    },
-                    {
-                        label: '是否印字',
-                        prop: 'printMark',
-                        type: 'select',
-                        width: 120,
-                        search: false,
-                        dicData:[
-                            {label:"是",value:true},
-                            {label:"否",value:false},
-                        ]
-                    },
-                    {
-                        label: '粉重',
-                        prop: 'powderWeight',
-                        width: 120,
-                        search: false,
-                    },
-                    {
-                        label: "材料号",
-                        prop: "materialNo",
-                        search: false,
-                        width: 120,
-                    },
-                    {
-                        label: '成型厚度',
-                        prop: 'thickness',
-                        width: 120,
-                        search: false,
-                    },
-                    {
-                        label: "炉批号",
-                        prop: "stovePiNo",
                         search: false,
-                        width: 120,
                     },
+                    
                     {
                         label:"出库数量",
                         prop: "outQty",
-                        width:150,
                     }
                 ]
             },
diff --git a/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/outboundDialog.vue b/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/outboundDialog.vue
index f2e05954..e4faa1c1 100644
--- a/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/outboundDialog.vue
+++ b/src/views/inboundOutboundManagement/graphiteMoldOutbound/components/outboundDialog.vue
@@ -249,6 +249,12 @@ export default {
             prop: 'goodsName',
             search: false,
           },
+          {
+            label: '齐套数量',
+            prop: 'completeQuantity',
+            search: false,
+            width: 150,
+          },
           {
             label: '库房',
             prop: 'shId',
diff --git a/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue b/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue
index b08bac1b..349de007 100644
--- a/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue
+++ b/src/views/inboundOutboundManagement/graphiteMoldOutbound/index.vue
@@ -224,6 +224,13 @@ export default {
             width: 150,
             sortable: 'custom',
           },
+          {
+            label: '齐套数量',
+            prop: 'completeQuantity',
+            search: false,
+            width: 150,
+            sortable: 'custom',
+          },
           {
             label: '物料需求数量',
             prop: 'needQuantity',
diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue
index 1d35a235..f989f2dd 100644
--- a/src/views/orderManagement/components/exception/dataMissing.vue
+++ b/src/views/orderManagement/components/exception/dataMissing.vue
@@ -1,23 +1,9 @@
 <template>
   <div>
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-      @row-update="rowUpdate"
-       @sort-change="sortChange"
-    >
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+      @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+      @row-update="rowUpdate" @sort-change="sortChange">
       <template #menu-left>
         <el-button type="primary" @click="claseOrder()" v-if="permission.missing_data_close_order">关闭订单</el-button>
       </template>
@@ -32,8 +18,7 @@
       <template #curStatusText="{ row }">
         <el-tag v-if="row.curStatusText == '已派工'">{{ row.curStatusText }}</el-tag>
         <el-tag class="ml-2" type="success" v-if="row.curStatusText == '已完工'">
-          {{ row.curStatusText }}</el-tag
-        >
+          {{ row.curStatusText }}</el-tag>
         <el-tag class="ml-2" type="info" v-if="row.curStatusText == '已关闭'">{{
           row.curStatusText
         }}</el-tag>
@@ -47,9 +32,9 @@
           row.curStatusText
         }}</el-tag>
       </template>
-       <template #validationMomo="{ row }">
-      <el-text class="mx-1" type="danger">{{ row.validationMomo }}</el-text>
-    </template>
+      <template #validationMomo="{ row }">
+        <el-text class="mx-1" type="danger">{{ row.validationMomo }}</el-text>
+      </template>
       <template #menu="{ row }">
         <el-button type="primary" text @click="editData(row)" v-if="permission.missing_data_edit">修改</el-button>
         <!-- <el-button text @click="editData1(row)">修改1</el-button> -->
@@ -60,177 +45,130 @@
       <template #demandDate="{ row }">
         {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
       </template>
-   
+
     </avue-crud>
-    <el-dialog v-model="isEdit" width="900" title="修改">
+    <el-dialog v-model="isEdit" width="80%" title="修改">
       <el-form :model="editForm" ref="form" :rules="formRules" label-width="120">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="计划单号：" prop="ypCode">
-              <el-input v-model="editForm.ypCode" clearable placeholder="请输入计划单号"></el-input>
+              <el-input v-model="editForm.ypCode" disabled clearable placeholder="请输入计划单号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+           <el-col :span="8">
+          <el-form-item label="生产单号：" prop="yoCode">
+            <el-input v-model="editForm.yoCode" disabled />
+          </el-form-item>
+        </el-col>
+          <el-col :span="8">
             <el-form-item label="零件号：" prop="partCode">
-              <jhSelect
-              :value="editForm.partCode"
-              @input="val => (editForm.partCode = val)"
-              placeholder="请搜索选择"
-              api-url="/blade-desk/dsPart/listNew"
-              echo-api="/blade-desk/dsPart/listNew"
-              echoParamsKey="ids"
-              echo-method="get"
-              api-method="get"
-              list-key="records"
-              total-key="total"
-              label-key="partCode"
-              value-key="id"
-              search-key="partCode"
-              :debounce-time="500"
-              @change="(value,item)=>partCodeChange(editForm.partCode,value,item)"
-            />
-              <!-- <el-select
-                v-model="editForm.partCode"
-                remote
-                :remote-method="queryCode"
-                filterable
-                :loading="partLoading"
-                placeholder="请选择零件号"
-                @change="changePart"
-              >
-                <el-option
-                  v-for="item in partCodeList"
-                  :key="item.partCode"
-                  :label="item.partCode"
-                  :value="item.partCode"
-                ></el-option>
-              </el-select> -->
+              <jhSelect :value="editForm.partCode" disabled @input="val => (editForm.partCode = val)"
+                placeholder="请搜索选择" api-url="/blade-desk/dsPart/listNew" echo-api="/blade-desk/dsPart/listNew"
+                echoParamsKey="ids" echo-method="get" api-method="get" list-key="records" total-key="total"
+                label-key="partCode" value-key="id" search-key="partCode" :debounce-time="500"
+                @change="(value, item) => partCodeChange(editForm.partCode, value, item)" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="批次号：" prop="batchNo">
+              <el-input v-model="editForm.batchNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流转编号：" prop="roamNo">
+              <el-input v-model="editForm.roamNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="下级B号：" prop="roamNoNext">
+              <el-input v-model="editForm.roamNoNext" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="订单类型：" prop="yieldType">
+              <el-select v-model="editForm.yieldType" placeholder="请选择" filterable clearable disabled>
+                <el-option  :value="12001" label="热表订单" />
+              
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="产品型号：" prop="productType">
-              <el-input
-                v-model="editForm.productType"
-                disabled
-                placeholder="请输入产品型号"
-              ></el-input>
+              <el-input v-model="editForm.productType" disabled placeholder="请输入产品型号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="产品名称：" prop="partName">
-              <el-input
-                v-model="editForm.partName"
-                disabled
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="editForm.partName" disabled placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="镀种：" prop="plate">
-              <el-input
-                v-model="editForm.plate"
-                clearable
-                
-                placeholder="请输入镀种"
-              ></el-input>
+          <el-col :span="8">
+            <el-form-item label="工艺路线：" prop="primaryCraft">
+              <el-input v-model="editForm.primaryCraft" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="面积(dm²)：" prop="ypArea">
-              <el-input
-                v-model="editForm.ypArea"
-                clearable
-                
-                placeholder="请输入面积(dm²)"
-              ></el-input>
+              <el-input v-model="editForm.ypArea" clearable disabled placeholder="请输入面积(dm²)"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="镀种：" prop="plate">
+              <el-input v-model="editForm.plate" clearable disabled placeholder="请输入镀种"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8">
             <el-form-item label="生产标识：" prop="productIdent">
-              <el-select v-model="editForm.productIdent" placeholder="请选择生产标识" filterable
-    clearable>
-                <el-option
-                  v-for="item in productIdentList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name"
-                ></el-option>
+              <el-select v-model="editForm.productIdent" placeholder="请选择生产标识" filterable clearable>
+                <el-option v-for="item in productIdentList" :key="item.id" :label="item.name"
+                  :value="item.name"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-         
-          <el-col :span="12">
+
+          <el-col :span="8">
             <el-form-item label="使用部门名称：" prop="useDept">
-              <el-input
-                v-model="editForm.useDept"
-                clearable
-                disabled
-                placeholder="请输入使用部门"
-              ></el-input>
+              <el-input v-model="editForm.useDept" clearable disabled placeholder="请输入使用部门"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="使用部门编码：" prop="useDept">
-              <el-input
-                v-model="editForm.useDeptCode"
-                clearable
-                disabled
-                placeholder="请输入使用部门"
-              ></el-input>
+              <el-input v-model="editForm.useDeptCode" clearable disabled placeholder="请输入使用部门"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+
+          <el-col :span="8">
             <el-form-item label="需求数量：" prop="ypQty">
-              <el-input v-model="editForm.ypQty" clearable placeholder="请输入需求数量"></el-input>
+              <el-input v-model="editForm.ypQty" clearable disabled placeholder="请输入需求数量"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="需求交期：" prop="demandDate">
-              <el-date-picker
-                style="width: 100%"
-                type="datetime"
-                placeholder="请选择需求交期"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                v-model="editForm.demandDate"
-              />
+              <el-date-picker style="width: 100%" type="date" placeholder="请选择需求交期" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" v-model="editForm.demandDate" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+
+
+          <el-col :span="8">
             <el-form-item label="计划部门编码：" prop="planDeptCode">
               <el-input v-model="editForm.planDeptCode" clearable placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="计划员：" prop="planUser">
               <el-input v-model="editForm.planUser" clearable placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="计划下达时间：" prop="releaseDate">
-              <el-date-picker
-                style="width: 100%"
-                type="datetime"
-                placeholder="请选择计划下达时间"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                v-model="editForm.releaseDate"
-              />
+              <el-date-picker style="width: 100%" type="datetime" placeholder="请选择计划下达时间" format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss" v-model="editForm.releaseDate" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="备注：" prop="memo">
               <el-input v-model="editForm.memo" type="textarea" placeholder="请输入备注"></el-input>
             </el-form-item>
@@ -259,14 +197,13 @@ import jhSelect from '@/components/jh-select/index.vue';
 import { mapGetters } from 'vuex';
 export default {
   components: { jhSelect },
-  computed:{
-     ...mapGetters([ 'permission']),
+  computed: {
+    ...mapGetters(['permission']),
   },
   data() {
     return {
       editForm: {},
       formRules: {
-        ypCode: [{ required: true, message: '请输入计划单号', trigger: 'change' }],
         partCode: [{ required: true, message: '请选择零件号', trigger: 'change' }],
         productIdent: [{ required: true, message: '请选择生产标识', trigger: 'change' }],
         ypQty: [{ required: true, message: '请输入需求数量', trigger: 'change' }],
@@ -349,7 +286,7 @@ export default {
         align: 'center',
 
         column: [
-           {
+          {
             label: '异常原因',
             prop: 'validationMomo',
             search: true,
@@ -490,7 +427,7 @@ export default {
             disabled: true,
             span: 12,
             width: 150,
-            searchOrder:20,
+            searchOrder: 20,
             headerAlign: 'center',
             rules: [
               {
@@ -840,14 +777,15 @@ export default {
         this.query.asc = undefined;
       } else {
         const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
-        
+
         this.query.orderByField = orderByField;
-        this.query.asc = order === 'ascending'?true:false;
+        this.query.asc = order === 'ascending' ? true : false;
       }
       // // 重新加载数据
       this.onLoad(this.page, this.query);
     },
     async editData(row) {
+      // row.yieldType = row.yieldType
       this.editForm = JSON.parse(JSON.stringify(row));
       const partRes = await getPartList({
         current: 1,
@@ -900,8 +838,8 @@ export default {
         });
       }
     },
-    partCodeChange(val,value,item) {
-      this.editForm.partName =item.partName
+    partCodeChange(val, value, item) {
+      this.editForm.partName = item.partName
     },
     submitEdit() {
       this.$refs.form.validate(valid => {
@@ -995,7 +933,7 @@ export default {
         current: this.page.currentPage,
         size: this.page.pageSize,
         validationResult: '16002',
-        yieldType:'12001',
+        yieldType: '12001',
         ...this.query,
       }).then(res => {
         if (res.data.code) {
@@ -1037,8 +975,8 @@ export default {
 };
 </script>
 <style scoped>
-:deep(.el-dialog){
-  height: 85vh;
+:deep(.el-dialog) {
+  max-height: 90vh;
   margin-top: 5vh;
 }
 </style>
diff --git a/src/views/orderManagement/components/exception_sj/dataMissing.vue b/src/views/orderManagement/components/exception_sj/dataMissing.vue
index d50788ab..de02c1e5 100644
--- a/src/views/orderManagement/components/exception_sj/dataMissing.vue
+++ b/src/views/orderManagement/components/exception_sj/dataMissing.vue
@@ -62,175 +62,132 @@
       </template>
    
     </avue-crud>
-    <el-dialog v-model="isEdit" width="900" title="修改">
+    <el-dialog v-model="isEdit" width="90%" title="修改">
       <el-form :model="editForm" ref="form" :rules="formRules" label-width="120">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="计划单号：" prop="ypCode">
-              <el-input v-model="editForm.ypCode" clearable placeholder="请输入计划单号"></el-input>
+              <el-input v-model="editForm.ypCode" disabled clearable placeholder="请输入计划单号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+           <el-col :span="8">
+          <el-form-item label="生产单号：" prop="yoCode">
+            <el-input v-model="editForm.yoCode" disabled />
+          </el-form-item>
+        </el-col>
+          <el-col :span="8">
             <el-form-item label="零件号：" prop="partCode">
-              <jhSelect
-              :value="editForm.partCode"
-              @input="val => (editForm.partCode = val)"
-              placeholder="请搜索选择"
-              api-url="/blade-desk/dsPart/listNew"
-              echo-api="/blade-desk/dsPart/listNew"
-              echoParamsKey="ids"
-              echo-method="get"
-              api-method="get"
-              list-key="records"
-              total-key="total"
-              label-key="partCode"
-              value-key="id"
-              search-key="partCode"
-              :debounce-time="500"
-              @change="(value,item)=>partCodeChange(editForm.partCode,value,item)"
-            />
-              <!-- <el-select
-                v-model="editForm.partCode"
-                remote
-                :remote-method="queryCode"
-                filterable
-                :loading="partLoading"
-                placeholder="请选择零件号"
-                @change="changePart"
-              >
-                <el-option
-                  v-for="item in partCodeList"
-                  :key="item.partCode"
-                  :label="item.partCode"
-                  :value="item.partCode"
-                ></el-option>
-              </el-select> -->
+              <jhSelect :value="editForm.partCode" disabled @input="val => (editForm.partCode = val)"
+                placeholder="请搜索选择" api-url="/blade-desk/dsPart/listNew" echo-api="/blade-desk/dsPart/listNew"
+                echoParamsKey="ids" echo-method="get" api-method="get" list-key="records" total-key="total"
+                label-key="partCode" value-key="id" search-key="partCode" :debounce-time="500"
+                @change="(value, item) => partCodeChange(editForm.partCode, value, item)" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="批次号：" prop="batchNo">
+              <el-input v-model="editForm.batchNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流转编号：" prop="roamNo">
+              <el-input v-model="editForm.roamNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="下级B号：" prop="roamNoNext">
+              <el-input v-model="editForm.roamNoNext" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="订单类型：" prop="yieldType">
+              <el-select v-model="editForm.yieldType" placeholder="请选择" filterable clearable disabled>
+                <!-- <el-option v-if="type == 'hotlist'" :value="12001" label="热表订单" /> -->
+                <el-option  :value="12002" label="烧结订单" />
+                <el-option  :value="12003" label="玻璃饼" />
+                <el-option  :value="12004" label="壳体" />
+                <el-option  :value="12005" label="插针" />
+                <el-option  :value="12006" label="石墨模" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="产品型号：" prop="productType">
-              <el-input
-                v-model="editForm.productType"
-                disabled
-                placeholder="请输入产品型号"
-              ></el-input>
+              <el-input v-model="editForm.productType" disabled placeholder="请输入产品型号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="产品名称：" prop="partName">
-              <el-input
-                v-model="editForm.partName"
-                disabled
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="editForm.partName" disabled placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="镀种：" prop="plate">
-              <el-input
-                v-model="editForm.plate"
-                clearable
-                
-                placeholder="请输入镀种"
-              ></el-input>
+          <el-col :span="8">
+            <el-form-item label="工艺路线：" prop="primaryCraft">
+              <el-input v-model="editForm.primaryCraft" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="面积(dm²)：" prop="ypArea">
-              <el-input
-                v-model="editForm.ypArea"
-                clearable
-                
-                placeholder="请输入面积(dm²)"
-              ></el-input>
+              <el-input v-model="editForm.ypArea" clearable disabled placeholder="请输入面积(dm²)"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item label="镀种：" prop="plate">
+              <el-input v-model="editForm.plate" clearable disabled placeholder="请输入镀种"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8">
             <el-form-item label="生产标识：" prop="productIdent">
-              <el-select v-model="editForm.productIdent" placeholder="请选择生产标识" filterable
-    clearable>
-                <el-option
-                  v-for="item in productIdentList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name"
-                ></el-option>
+              <el-select v-model="editForm.productIdent" placeholder="请选择生产标识" filterable clearable>
+                <el-option v-for="item in productIdentList" :key="item.id" :label="item.name"
+                  :value="item.name"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-         
-          <el-col :span="12">
+
+          <el-col :span="8">
             <el-form-item label="使用部门名称：" prop="useDept">
-              <el-input
-                v-model="editForm.useDept"
-                clearable
-                disabled
-                placeholder="请输入使用部门"
-              ></el-input>
+              <el-input v-model="editForm.useDept" clearable disabled placeholder="请输入使用部门"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="使用部门编码：" prop="useDept">
-              <el-input
-                v-model="editForm.useDeptCode"
-                clearable
-                disabled
-                placeholder="请输入使用部门"
-              ></el-input>
+              <el-input v-model="editForm.useDeptCode" clearable disabled placeholder="请输入使用部门"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+
+          <el-col :span="8">
             <el-form-item label="需求数量：" prop="ypQty">
-              <el-input v-model="editForm.ypQty" clearable placeholder="请输入需求数量"></el-input>
+              <el-input v-model="editForm.ypQty" clearable disabled placeholder="请输入需求数量"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="需求交期：" prop="demandDate">
-              <el-date-picker
-                style="width: 100%"
-                type="datetime"
-                placeholder="请选择需求交期"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                v-model="editForm.demandDate"
-              />
+              <el-date-picker style="width: 100%" type="date" placeholder="请选择需求交期" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" v-model="editForm.demandDate" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+
+
+          <el-col :span="8">
             <el-form-item label="计划部门编码：" prop="planDeptCode">
               <el-input v-model="editForm.planDeptCode" clearable placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="计划员：" prop="planUser">
               <el-input v-model="editForm.planUser" clearable placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="计划下达时间：" prop="releaseDate">
-              <el-date-picker
-                style="width: 100%"
-                type="datetime"
-                placeholder="请选择计划下达时间"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                v-model="editForm.releaseDate"
-              />
+              <el-date-picker style="width: 100%" type="datetime" placeholder="请选择计划下达时间" format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss" v-model="editForm.releaseDate" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="备注：" prop="memo">
               <el-input v-model="editForm.memo" type="textarea" placeholder="请输入备注"></el-input>
             </el-form-item>
@@ -266,7 +223,6 @@ export default {
     return {
       editForm: {},
       formRules: {
-        ypCode: [{ required: true, message: '请输入计划单号', trigger: 'change' }],
         partCode: [{ required: true, message: '请选择零件号', trigger: 'change' }],
         productIdent: [{ required: true, message: '请选择生产标识', trigger: 'change' }],
         ypQty: [{ required: true, message: '请输入需求数量', trigger: 'change' }],
@@ -274,7 +230,6 @@ export default {
         planUser: [{ required: true, message: '请输入计划员', trigger: 'change' }],
         releaseDate: [{ required: true, message: '请选择计划下达时间', trigger: 'change' }],
         planDeptCode: [{ required: true, message: '请输入计划部门编码', trigger: 'change' }],
-        // productType:[{required: true, message: '请输入产品型号', trigger: 'blur'}]
       },
       partCodeList: [],
       productIdentList: [],
@@ -1038,7 +993,7 @@ export default {
 </script>
 <style scoped>
 :deep(.el-dialog){
-  height: 85vh;
+  max-height: 90vh;
   margin-top: 5vh;
 }
 </style>
diff --git a/src/views/orderManagement/components/orderUpdateDailog.vue b/src/views/orderManagement/components/orderUpdateDailog.vue
index 425d2b7b..a80bc2fe 100644
--- a/src/views/orderManagement/components/orderUpdateDailog.vue
+++ b/src/views/orderManagement/components/orderUpdateDailog.vue
@@ -1,49 +1,40 @@
 <template>
-  <el-dialog title="修改" append-to-body :modelValue="openShow" width="60%" @close="closeDialog">
+  <el-dialog title="修改" :modelValue="openShow" width="80%" @close="closeDialog" class="dialog_box" style="max-height: 90vh;margin-top:5vh">
     <el-form :model="formData" :rules="rules" ref="formRules" :label-width="120">
       <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="计划单号" prop="ypCode">
+        <el-col :span="8">
+          <el-form-item label="计划单号：" prop="ypCode">
             <el-input v-model="formData.ypCode" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="生产单号" prop="yoCode">
+        <el-col :span="8">
+          <el-form-item label="生产单号：" prop="yoCode">
             <el-input v-model="formData.yoCode" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="零件号" prop="partCode">
+        <el-col :span="8">
+          <el-form-item label="零件号：" prop="partCode">
             <el-input v-model="formData.partCode" disabled></el-input>
-            <!-- <el-select v-model="formData.partCode" placeholder="请输入" disabled>
-              <el-option label="零件1" value="1" />
-              <el-option label="零件12" value="2" />
-            </el-select> -->
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="批次号" prop="batchNo">
+        <el-col :span="8">
+          <el-form-item label="批次号：" prop="batchNo">
             <el-input v-model="formData.batchNo" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="流转编号" prop="roamNo">
-            <el-select v-model="formData.roamNo" placeholder="请输入" filterable
-    clearable>
-              <el-option label="B090989" value="1" />
-              <el-option label="B0909889898" value="2" />
-            </el-select>
+        <el-col :span="8">
+          <el-form-item label="流转编号：" prop="roamNo">
+            <el-input v-model="formData.roamNo" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="下级B号" prop="roamNoNext">
+        <el-col :span="8">
+          <el-form-item label="下级B号：" prop="roamNoNext">
             <el-input v-model="formData.roamNoNext" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="订单类型" prop="yieldType">
-            <el-select v-model="formData.yieldType" placeholder="请选择" filterable
-    clearable>
+        <el-col :span="8">
+          <el-form-item label="订单类型：" prop="yieldType">
+            <el-select v-model="formData.yieldType" placeholder="请选择" filterable clearable disabled>
               <el-option v-if="type == 'hotlist'" :value="12001" label="热表订单" />
               <el-option v-if="type == 'sintering'" :value="12002" label="烧结订单" />
               <el-option v-if="type == 'sintering'" :value="12003" label="玻璃饼" />
@@ -53,87 +44,79 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="产品型号" prop="productType">
+        <el-col :span="8">
+          <el-form-item label="产品型号：" prop="productType">
             <el-input v-model="formData.productType" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="产品名称" prop="partName">
+        <el-col :span="8">
+          <el-form-item label="产品名称：" prop="partName">
             <el-input v-model="formData.partName" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="工艺路线" prop="primaryCraft">
+        <el-col :span="8">
+          <el-form-item label="工艺路线：" prop="primaryCraft">
             <el-input v-model="formData.primaryCraft" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="镀种" prop="plate">
-            <el-input v-model="formData.plate" disabled />
+        <el-col :span="8">
+          <el-form-item label="面积(d㎡)：" prop="ypArea">
+            <el-input v-model="formData.ypArea" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="生产标识" prop="productIdent">
-            <el-select v-model="formData.productIdent" placeholder="请选择" filterable
-    clearable>
+        <el-col :span="8">
+          <el-form-item label="镀种：" prop="plate">
+            <el-input v-model="formData.plate" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="生产标识：" prop="productIdent">
+            <el-select v-model="formData.productIdent" placeholder="请选择" filterable clearable>
               <el-option v-for="item in prodIdentList" :key="item.id" :value="item.id" :label="item.name" />
-              <!-- <el-option :value="2" label="JIII" /> -->
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="使用部门" prop="useDept">
-            <el-input v-model="formData.useDept" />
+        <el-col :span="8">
+          <el-form-item label="使用部门名称：">
+            <el-input v-model="formData.useDept" clearable disabled placeholder="请输入使用部门"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="数量" prop="ypQty">
+        <el-col :span="8">
+          <el-form-item label="使用部门编码：">
+            <el-input v-model="formData.useDeptCode" clearable disabled placeholder="请输入使用部门"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="需求数量：" prop="ypQty">
             <el-input v-model="formData.ypQty" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="面积(d㎡)" prop="ypArea">
-            <el-input v-model="formData.ypArea" disabled />
+
+        <el-col :span="8">
+          <el-form-item label="需求交期：" prop="demandDate">
+            <el-date-picker v-model="formData.demandDate" placeholder="请选择" type="date" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="需求交期" prop="demandDate">
-            <el-date-picker
-              v-model="formData.demandDate"
-              placeholder="请选择"
-              type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
+        <el-col :span="8">
+          <el-form-item label="计划部门编码：" prop="planDeptCode">
+            <el-input v-model="formData.planDeptCode" clearable placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="计划员" prop="planUser">
+        <el-col :span="8">
+          <el-form-item label="计划员：" prop="planUser">
             <el-input v-model="formData.planUser" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="计划下达时间" prop="releaseDate">
-            <el-date-picker
-              v-model="formData.releaseDate"
-              placeholder="请选择"
-              type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
+        <el-col :span="8">
+          <el-form-item label="计划下达时间：" prop="releaseDate">
+            <el-date-picker v-model="formData.releaseDate" placeholder="请选择" type="datetime"
+              format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="备注" prop="memo">
-            <el-input
-              v-model="formData.memo"
-              :rows="2"
-              type="textarea"
-              minlength="0"
-              maxlength="200"
-              show-word-limit
-            />
+        <el-col :span="12">
+          <el-form-item label="备注：" prop="memo">
+            <el-input v-model="formData.memo" :rows="2" type="textarea" minlength="0" maxlength="200" show-word-limit />
           </el-form-item>
         </el-col>
       </el-row>
@@ -148,7 +131,7 @@
   </el-dialog>
 </template>
 <script>
-import { update,getassayContentDeatils,getProdIdentList } from '@/api/orderManagement/planYieIdOrder';
+import { update, getassayContentDeatils, getProdIdentList } from '@/api/orderManagement/planYieIdOrder';
 export default {
   props: {
     showDialog: {
@@ -163,9 +146,9 @@ export default {
       type: String,
       default: false,
     },
-    type:{
+    type: {
       type: String,
-      default:''
+      default: ''
     }
   },
   data() {
@@ -173,16 +156,13 @@ export default {
       openShow: false,
       tableData: [],
       formData: {},
-      prodIdentList:[],
+      prodIdentList: [],
       rules: {
-        ypCode: [{ required: true, message: '请输入', trigger: 'blur' }],
         yoCode: [
           { required: true, message: '请输入', trigger: 'blur' },
-          // { validator: checkYoCode, trigger: 'blur' },
         ],
         partCode: [{ required: true, message: '请输入', trigger: 'blur' }],
         productIdent: [{ required: true, message: '请输入', trigger: 'blur' }],
-        useDept: [{ required: true, message: '请输入', trigger: 'blur' }],
         ypQty: [{ required: true, message: '请输入', trigger: 'blur' }],
         demandDate: [{ required: true, message: '请输入', trigger: 'blur' }],
         planUser: [{ required: true, message: '请输入', trigger: 'blur' }],
@@ -190,8 +170,7 @@ export default {
 
         batchNo: [{ required: true, message: '请输入', trigger: 'blur' }],
         cardNo: [{ required: true, message: '请输入', trigger: 'blur' }],
-        // roamNo: [{ required: true, message: '请输入', trigger: 'blur' }],
-        yieldType: [{ required: true, message: '请输入', trigger: 'blur' }],
+        planDeptCode: [{ required: true, message: '请输入计划部门编码', trigger: 'change' }],
       },
     };
   },
@@ -199,71 +178,13 @@ export default {
     this.openShow = this.showDialog;
     this.getDetail()
     this.getProdIdentList()
-    // this.formData = {
-    //   partCode: 1,
-    //   yoCode: 'WO-98978789988',
-    //   batchNo: 'Y0232511359',
-    //   businessType: -1,
-    //   businessTypeTitle: null,
-    //   cardNo: '1022413231',
-    //   craftId: null,
-    //   curStatus: 0,
-    //   curStatusTitle: '待接收',
-    //   custodian: '肖盼盼',
-    //   demandDate: '2025-11-18',
-    //   dsCraft: { craftId: 59361, craftNo: 'C000000' },
-    //   dsPart: { partCode: '21E8-900-363-H1', partCode: 1, partName: 'M2 螺钉' },
-    //   entrustDept: '采购与物流中心 (成件)',
-    //   failureMan: {
-    //     accountId: null,
-    //     card: null,
-    //     createTime: null,
-    //     curStatus: 1,
-    //     deleted: false,
-    //     deptName: null,
-    //   },
-    //   failureMemo: null,
-    //   failureTime: null,
-    //   fatherVoid: null,
-    //   keyValue: 4490279,
-    //   kitPreparationMan: {
-    //     accountId: null,
-    //     card: null,
-    //     createTime: null,
-    //     curStatus: 1,
-    //     deleted: false,
-    //     deptName: null,
-    //   },
-    //   kitPreparationTime: null,
-    //   manualIncrease: false,
-    //   memo: null,
-    //   newlevFlag: '采购',
-    //   nextRoom: null,
-    //   nextRoomName: null,
-    //   partCode: '21E8-900-363-H1',
-    //   partName: 'M2 螺钉',
-    //   pdmUrl: null,
-    //   pkDate: null,
-    //   pkUsername: null,
-    //   planUser: '申强',
-    //   plate: 'Ct.P',
-    //   ypArea: 0.0170467129,
-    //   ypCode: 'WO-N251174111',
-    //   poMemo: 'DZ',
-    //   poProdLine: 'J303',
-    //   ypQty: 22,
-    //   primaryCraft: '库 1-1 (机加)-4 (表)- 库 2',
-    //   priority: 1,
-    //   prodident: 'JII',
-    //   produceBool: false,
-    //   productType: null,
-    // };
   },
   methods: {
-    getDetail(){
-      getassayContentDeatils({id:this.id}).then(res =>{
-        console.log('res----------',res)
+    getDetail() {
+      getassayContentDeatils({ id: this.id }).then(res => {
+        console.log('res----------', res)
         this.formData = res.data.data
+        this.formData.productIdent = this.formData.productIdent + ''
       })
     },
     // 获取生产标识下拉数据
@@ -279,14 +200,14 @@ export default {
     submit() {
       this.$refs.formRules.validate(valid => {
         if (valid) {
-          console.log('this.formData',this.formData)
+          console.log('this.formData', this.formData)
           update(this.formData).then(res => {
             console.log(res);
-            if(res.data.code===200){
+            if (res.data.code === 200) {
               this.$message.success('修改成功')
               this.openShow = false;
-              this.$emit("closeDialog",true)
- 
+              this.$emit("closeDialog", true)
+
             }
           });
         }
@@ -295,4 +216,9 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss">
+// .dialog_box .el-dialog__body {
+//   max-height: calc(95vh - 180px);
+//   overflow-y: auto;
+// }
+</style>
diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue
index 8ec9d4ba..8d9d5511 100644
--- a/src/views/orderManagement/planYieIdOrder.vue
+++ b/src/views/orderManagement/planYieIdOrder.vue
@@ -1,22 +1,9 @@
 <template>
   <basic-container>
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-      @sort-change="sortChange"
-    >
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+      @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+      @sort-change="sortChange">
       <template #menu-left>
         <el-button type="primary" @click="batchClose()" v-if="permission.rb_order_batch_close">批量关闭</el-button>
         <el-button type="primary" @click.stop="priorityFn(row)" v-if="permission.rb_order_priority">优先级调整</el-button>
@@ -32,8 +19,7 @@
       <template #curStatusText="{ row }">
         <el-tag v-if="row.curStatusText == '已派工'">{{ row.curStatusText }}</el-tag>
         <el-tag class="ml-2" type="success" v-if="row.curStatusText == '已完工'">
-          {{ row.curStatusText }}</el-tag
-        >
+          {{ row.curStatusText }}</el-tag>
         <el-tag class="ml-2" type="info" v-if="row.curStatusText == '已关闭'">{{
           row.curStatusText
         }}</el-tag>
@@ -46,56 +32,31 @@
       </template>
       <template #menu="{ row }">
         <div class="menu-buttons">
-          <el-button v-if="permission.rb_order_process_route" type="primary" text plain @click="lookProcessRoute(row)" :id="id"
-            >工艺路线
+          <el-button v-if="permission.rb_order_process_route" type="primary" text plain @click="lookProcessRoute(row)"
+            :id="id">工艺路线
           </el-button>
-          <!-- <el-button type="primary" text plain size="small" @click.stop="priorityFn(row)">优先级调整
-                    </el-button> -->
-          <el-button type="primary" text plain @click.stop="updateFn(row)" v-if="permission.rb_order_edit">修改 </el-button>
-          <!-- <el-button type="primary" text plain size="small" @click.stop="confirmFn(row)">批量确认
-                    </el-button> -->
+
+          <el-button type="primary" text plain @click.stop="updateFn(row)" v-if="permission.rb_order_edit">修改
+          </el-button>
+
         </div>
       </template>
       <template #demandDate="{ row }">
         {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
       </template>
-      <!-- <template #releaseDate="{ row }">
-        {{ row.releaseDate ? row.releaseDate.substring(0, 10) : '' }}
-      </template> -->
-    </avue-crud>
 
-    <!-- 加急 -->
-    <!-- <rushDialog :showDialog="isRushOpen" v-if="isRushOpen" @closeDialog="closeDialog"></rushDialog>
-
-        <batchDialog :showDialog="isBatchOpen" v-if="isBatchOpen" @closeDialog="closeDialog"></batchDialog> -->
+    </avue-crud>
 
     <!-- 修改 -->
-    <orderUpdateDailog
-      :showDialog="isUpdateOpen"
-      type="hotlist"
-      v-if="isUpdateOpen"
-      @closeDialog="closeDialog"
-      :id="id"
-    >
+    <orderUpdateDailog :showDialog="isUpdateOpen" type="hotlist" v-if="isUpdateOpen" @closeDialog="closeDialog"
+      :id="id">
     </orderUpdateDailog>
     <!-- 优先级调整 -->
-    <priorityDialog
-      :showDialog="isPriorityOpen"
-      v-if="isPriorityOpen"
-      @closeDialog="closeDialog"
-      @submitPriority="handlePrioritySubmit"
-      :priorityName="priorityName"
-      :list="selectionList"
-    ></priorityDialog>
+    <priorityDialog :showDialog="isPriorityOpen" v-if="isPriorityOpen" @closeDialog="closeDialog"
+      @submitPriority="handlePrioritySubmit" :priorityName="priorityName" :list="selectionList"></priorityDialog>
     <!-- 工艺路线弹窗 -->
-    <lookProcess
-      :id="id"
-      :is-open="isOpen"
-      v-if="isOpen"
-      @cancel="closeDialog"
-      :rowData="rowItem"
-      sourceId="planYieIdOrder"
-    ></lookProcess>
+    <lookProcess :id="id" :is-open="isOpen" v-if="isOpen" @cancel="closeDialog" :rowData="rowItem"
+      sourceId="planYieIdOrder"></lookProcess>
   </basic-container>
 </template>
 
@@ -119,16 +80,13 @@ import {
 import { mapGetters } from 'vuex';
 import { validatenull } from '@/utils/validate';
 import lookProcess from './components/lookProcess.vue';
-// import rushDialog from './components/rushDialog.vue'
-// import batchDialog from './components/batchDialog.vue'
+
 import orderUpdateDailog from './components/orderUpdateDailog.vue';
 import priorityDialog from './components/priorityDialog.vue';
 export default {
   components: {
     orderUpdateDailog,
     priorityDialog,
-    // rushDialog,
-    // batchDialog
     lookProcess,
   },
   data() {
@@ -1122,7 +1080,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => {});
+      }).then(() => { });
     },
     async onLoad(page, params = {}) {
       this.loading = true;
diff --git a/src/views/warehouseManagement/components/materialAdd.vue b/src/views/warehouseManagement/components/materialAdd.vue
index 3895541c..9dfac245 100644
--- a/src/views/warehouseManagement/components/materialAdd.vue
+++ b/src/views/warehouseManagement/components/materialAdd.vue
@@ -53,6 +53,15 @@ export default {
             overflow: true,
             search: true,
             width: 120,
+          },
+           {
+            label: '换算比例',
+            prop: 'conversionRatio',
+            disabled: true,
+            span: 12,
+            overflow: true,
+            search: true,
+            width: 120,
           },
           {
             label: '计量单位',
diff --git a/src/views/warehouseManagement/materialMaintenance.vue b/src/views/warehouseManagement/materialMaintenance.vue
index 8f987d09..cd47523e 100644
--- a/src/views/warehouseManagement/materialMaintenance.vue
+++ b/src/views/warehouseManagement/materialMaintenance.vue
@@ -1,63 +1,31 @@
 <template>
   <basic-container>
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @row-update="rowUpdate"
-      :before-open="beforeOpen"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-      :row-class-name="tableRowClassName"
-      @sort-change="sortChange"
-    >
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+      @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
+      :before-open="beforeOpen" @selection-change="selectionChange" @current-change="currentChange"
+      @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" :row-class-name="tableRowClassName"
+      @sort-change="sortChange">
       <template #deptName="{ row }">{{ row.dept && row.dept.deptName }}</template>
       <template #materialGoods="{ row }">{{ row.materialGoods.goodsCode }}</template>
       <template #menu-left>
         <div style="display: flex">
           <el-input v-model="goodsCode" placeholder="请输入物料编码"></el-input>
-          <el-button type="primary" style="margin-left: 10px" @click="handleAdd" v-if="permission.materialMaintain_add">新增</el-button>
+          <el-button type="primary" style="margin-left: 10px" @click="handleAdd"
+            v-if="permission.materialMaintain_add">新增</el-button>
         </div>
       </template>
       <template #used="scope">
-        <el-switch
-          v-model="scope.row.used"
-          :active-value="true"
-          :inactive-value="false"
-          active-color="#ff4949"
-          inactive-color="#13ce66"
-          :disabled="!permission.materialMaintain_isUsed"
-          @change="rowUpdate(scope.row)"
-        />
+        <el-switch v-model="scope.row.used" :active-value="true" :inactive-value="false" active-color="#ff4949"
+          inactive-color="#13ce66" :disabled="!permission.materialMaintain_isUsed" @change="rowUpdate(scope.row)" />
       </template>
       <template #minWarning="scope">
-        <el-switch
-          v-model="scope.row.minWarning"
-          :active-value="true"
-          :inactive-value="false"
-          active-color="#ff4949"
-          :disabled="!permission.materialMaintain_minWarning"
-          inactive-color="#13ce66"
-          @change="rowUpdate(scope.row)"
-        />
+        <el-switch v-model="scope.row.minWarning" :active-value="true" :inactive-value="false" active-color="#ff4949"
+          :disabled="!permission.materialMaintain_minWarning" inactive-color="#13ce66" @change="rowUpdate(scope.row)" />
       </template>
     </avue-crud>
     <!-- 新增 -->
-    <materialAdd
-      v-if="materialAddShow"
-      :show-dialog="materialAddShow"
-      :rowItem="rowItem"
-      @closeDialog="closeDialog"
-    ></materialAdd>
+    <materialAdd v-if="materialAddShow" :show-dialog="materialAddShow" :rowItem="rowItem" @closeDialog="closeDialog">
+    </materialAdd>
   </basic-container>
 </template>
 
@@ -169,6 +137,13 @@ export default {
               },
             ],
           },
+          {
+            label: '换算比例',
+            prop: 'conversionRatio',
+            span: 12,
+            width: 120,
+            type: 'number',
+          },
           {
             label: '计量单位',
             prop: 'unitName',
@@ -548,7 +523,7 @@ export default {
       };
     },
   },
-  mounted() {},
+  mounted() { },
   methods: {
     // 排序
     sortChange({ prop, order }) {
@@ -558,7 +533,7 @@ export default {
       this.query[orderByFieldKey] = !prop
         ? undefined
         : prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
-        // 重新加载数据
+      // 重新加载数据
       this.onLoad(this.page, this.query);
     },
     closeDialog() {
@@ -654,6 +629,7 @@ export default {
 
 <style scoped>
 :deep(.warning-row) {
-  background-color: rgba(40, 167, 69, 0.5) !important; /* 淡红色背景 */
+  background-color: rgba(40, 167, 69, 0.5) !important;
+  /* 淡红色背景 */
 }
 </style>
\ No newline at end of file
diff --git a/src/views/zhgd-work/childWarehousing/index.vue b/src/views/zhgd-work/childWarehousing/index.vue
index 79751b90..a8cdeec3 100644
--- a/src/views/zhgd-work/childWarehousing/index.vue
+++ b/src/views/zhgd-work/childWarehousing/index.vue
@@ -6,86 +6,30 @@
           <el-row :gutter="12">
             <el-col :span="6">
               <el-form-item label="流程卡号" prop="cardNo" label-width="100px">
-                <el-input
-                  ref="codeFocus"
-                  v-model="formData.cardNo"
-                  placeholder="请扫描流程卡"
-                  @keyup.enter.native="codeKeyUp"
-                />
+                <el-input ref="codeFocus" v-model="formData.cardNo" placeholder="请扫描流程卡"
+                  @keyup.enter.native="codeKeyUp" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="仓库" prop="shId" label-width="60px">
-                <jhSelect
-                  v-model="formData.shId"
-                  placeholder="请搜索选择"
-                  api-url="/blade-wms/stStorehouse/page"
-                  echo-api="/blade-wms/stStorehouse/page"
-                  echoParamsKey="ids"
-                  echo-method="get"
-                  api-method="get"
-                  list-key="records"
-                  total-key="total"
-                  label-key="shName"
-                  value-key="id"
-                  search-key="id"
-                  :debounce-time="500"
-                  @change="(val, item) => storeHouse(val, item)"
-                />
+                <jhSelect v-model="formData.shId" placeholder="请搜索选择" api-url="/blade-wms/stStorehouse/page"
+                  echo-api="/blade-wms/stStorehouse/page" echoParamsKey="ids" echo-method="get" api-method="get"
+                  list-key="records" total-key="total" label-key="shName" value-key="id" search-key="id"
+                  :debounce-time="500" @change="(val, item) => storeHouse(val, item)" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="库位" prop="cslId" label-width="60px">
-                <jhSelect
-                  v-model="formData.cslId"
-                  placeholder="请搜索选择"
-                  api-url="/blade-wms/stStorageLocation/list"
-                  echo-api="/blade-wms/stStorageLocation/list"
-                  echoParamsKey="ids"
-                  echo-method="get"
-                  api-method="get"
-                  list-key="records"
-                  total-key="total"
-                  label-key="location"
-                  value-key="id"
-                  search-key="id"
-                  :debounce-time="500"
-                  :disabled="!formData.shId"
-                  :params="{ shId: formData.shId }"
-                  @change="(val, item) => storeHouse(val, item)"
-                />
-                <!-- <el-select
-                  v-model="formData.cslId"
-                  :disabled="!formData.shId"
-                  filterable
-                  placeholder="请选择库位"
-                >
-                  <el-option
-                    v-for="item in locationOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select> -->
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="质量编号" prop="qualityNumber" label-width="60px">
-                <el-input v-model="formData.qualityNumber" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="到期日期" prop="dueDate" label-width="60px">
-                <el-date-picker
-                  v-model="formData.dueDate"
-                  type="date"
-                  format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD"
-                  placeholder="选择日期"
-                >
-                </el-date-picker>
+                <jhSelect v-model="formData.cslId" placeholder="请搜索选择" api-url="/blade-wms/stStorageLocation/list"
+                  echo-api="/blade-wms/stStorageLocation/list" echoParamsKey="ids" echo-method="get" api-method="get"
+                  list-key="records" total-key="total" label-key="location" value-key="id" search-key="id"
+                  :debounce-time="500" :disabled="!formData.shId" :params="{ shId: formData.shId }"
+                  @change="(val, item) => storeHouse(val, item)" />
+
               </el-form-item>
             </el-col>
+
+
           </el-row>
         </el-form>
       </div>
@@ -118,10 +62,19 @@
             <template #label> 加工班组 </template>
             {{ tableObj.tsName }}
           </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 质量编号 </template>
+            <el-input v-model="formData.qualityNumber" placeholder="请输入" />
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 到期日期 </template>
+            <el-date-picker v-model="formData.dueDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-descriptions-item>
           <el-descriptions-item>
             <template #label> 数量 </template>
-            <!-- {{ tableObj.makeQty }} -->
-              <el-input style="width: 220px" v-model="tableObj.makeQty" placeholder="请输入" />
+            <el-input style="width: 220px" type="number" v-model="tableObj.makeQty" placeholder="请输入" />
           </el-descriptions-item>
         </el-descriptions>
       </div>
@@ -149,6 +102,8 @@ export default {
         cslId: null,
         qualityNumber: '', //质量编号
         dueDate: '', //时间
+        batchNo: '',
+        makeQty: '',
       },
       rules: {
         cardNo: [
@@ -175,7 +130,7 @@ export default {
       locationOptions: [],
     };
   },
-  mounted() {},
+  mounted() { },
   methods: {
     codeKeyUp() {
       if (this.formData.cardNo) {
@@ -188,7 +143,7 @@ export default {
     onSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
-          pdaSaveSubOrder(this.formData).then(res => {
+          pdaSaveSubOrder({ ...this.formData, batchNo: this.tableObj.batchNo, makeQty: this.tableObj.makeQty }).then(res => {
             this.$message.success('入库成功');
             this.tableObj = {};
             this.formData = {
@@ -207,9 +162,12 @@ export default {
 <style lang="scss" scoped>
 :deep(.equal-width-descriptions .el-descriptions__body table) {
   width: 100%;
-  table-layout: fixed; /* 关键：强制等宽 */
+  table-layout: fixed;
+  /* 关键：强制等宽 */
 }
+
 :deep(.equal-width-descriptions .el-descriptions__cell) {
-  word-break: break-word; /* 长文本自动换行 */
+  word-break: break-word;
+  /* 长文本自动换行 */
 }
 </style>