diff --git a/src/views/business-asn/asn/viewAsnDetail.vue b/src/views/business-asn/asn/viewAsnDetail.vue
index 951a5fd..3871b36 100644
--- a/src/views/business-asn/asn/viewAsnDetail.vue
+++ b/src/views/business-asn/asn/viewAsnDetail.vue
@@ -265,16 +265,17 @@
       :visible.sync="dialogInsertAsnDetail"
       center
       width="400px"
+      top="0.5vh"
       :close-on-click-modal="false"
       :before-close="handleAsnDetailClose"
 
     >
       <el-form ref="form" :rules="asnDetailRules" :model="form" size="small" label-width="80px"
-               style="height: 300px"
+
       >
 
-        <el-form-item label="物料" prop="item" style="float: left">
-          <el-select v-model="form.item" value-key="id" filterable placeholder="请选择品番" style="width: 200px;"
+        <el-form-item label="物料" prop="item" >
+          <el-select v-model="form.item" value-key="id" filterable placeholder="请选择料号" style="width: 270px;"
                      @change="getPointList(form.item,$event.code,asn)"
                      clearable
           >
@@ -289,21 +290,41 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="订单数量" prop="orderQty" style="float: left">
-          <el-input v-model="form.orderQty" style="width: 200px;"/>
+
+
+
+        <el-form-item label="订单数量" prop="orderQty" >
+          <el-input v-model.number="form.orderQty" />
         </el-form-item>
-        <el-form-item v-if="isBatch" label="批次号" prop="propC1" style="float: left">
-          <el-input v-model="form.propC1" style="width: 200px;"/>
+        <el-form-item label="Loc">
+          <el-input  v-model="form.propC4"></el-input>
         </el-form-item>
-        <el-form-item v-if="isSerial" label="序列号" prop="propC2" style="float: left">
-          <el-input v-model="form.propC2" style="width: 200px;"/>
+        <el-form-item label="工厂">
+          <el-input  v-model="form.propC3"></el-input>
         </el-form-item>
-        <el-form-item v-if="isValidPeriod" label="生成日期" prop="propD1" style="float: left">
-          <el-input v-model="form.propD1" style="width: 200px;"/>
+        <el-form-item label="特殊标记">
+          <el-input  v-model="form.propC5"></el-input>
+        </el-form-item>
+        <el-form-item label="供应商">
+          <el-input  v-model="form.propC6"></el-input>
+        </el-form-item>
+        <el-form-item v-if="form.item==null?false:form.item.isBatch" label="批次号" prop="propC1" >
+          <el-input v-model="form.propC1" />
+        </el-form-item>
+        <el-form-item v-if="form.item==null?false:form.item.isSerial" label="序列号" prop="propC2" >
+          <el-input v-model="form.propC2" />
+        </el-form-item>
+        <el-form-item v-if="form.item==null?false:form.item.isValidPeriod" label="生产日期" prop="propD1" >
+          <el-date-picker
+            style="width: 270px;"
+            v-model="form.propD1"
+            type="date"
+            placeholder="选择日期">
+          </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="备注" prop="remark" style="float: left">
-          <el-input type="textarea" :rows="2" v-model="form.remark" style="width: 200px;"/>
+        <el-form-item label="备注" prop="remark" >
+          <el-input type="textarea" :rows="2" v-model="form.remark" style="width: 270px;"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -327,6 +348,22 @@
           <el-input disabled v-model="zlForm.item.name"></el-input>
         </el-form-item>
 
+        <el-form-item v-if="zlForm.item.isBatch"  label="批次号" prop="propC1">
+          <el-input v-model="zlForm.propC1" disabled />
+        </el-form-item>
+        <el-form-item v-if="zlForm.item.isSerial"  label="序列号" prop="propC2" >
+          <el-input v-model="zlForm.propC2" disabled />
+        </el-form-item>
+        <el-form-item v-if="zlForm.item.isValidPeriod"  label="生产日期" prop="propD1">
+          <el-date-picker
+            disabled
+            style="width: 370px"
+            v-model="zlForm.propD1"
+            type="date"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+
         <el-form-item label="待收数量">
           <el-input disabled v-model.number="zlForm.orderQty"></el-input>
         </el-form-item>
@@ -618,14 +655,14 @@ export default {
       logining2: false,
       logining3: false,
       pointTF: false,
-      isBatch: false,
-      isSerial: false,
-      isValidPeriod: false,
       zlForm: {
         item: {},
         asn: {},
         area: {},
         point: {},
+        propC1: null,
+        propC2: null,
+        propD1:null,
         orderQty: 0,
         shQty: 0
       },
@@ -698,13 +735,6 @@ export default {
     ,
     //查询库位
     getPointList(itObj, code, data) {
-      console.log(itObj)
-      if (itObj != null) {
-        this.isBatch = itObj.isBatch;
-        this.isSerial = itObj.isSerial;
-        this.isValidPeriod = itObj.isValidPeriod
-      }
-
       queryPointList({}).then(res => {
         this.pointOptions = res
       })
@@ -882,9 +912,6 @@ export default {
     },
     handleAsnDetailClose(done) {
       this.form = {};
-      this.isBatch = false,
-        this.isSerial = false,
-        this.isValidPeriod = false
       done();
     },
     asnDetailConf() {
@@ -909,9 +936,6 @@ export default {
     },
     asnDetailCel() {
       this.form = {};
-      this.isBatch = false,
-        this.isSerial = false,
-        this.isValidPeriod = false
       this.dialogInsertAsnDetail = false;
     },
     toEditAsnDetail(data) {