冲突BONDEDUPPLY

src/views/BONDEDUPPLY/index.vue

@@ -140,24 +140,26 @@
     />
 
     <!-- 添加或修改保税区供应链数据对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      :close-on-click-modal="false"
-      width="35%"
-      append-to-body
-    >
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="基本信息" name="first">
-          <el-form ref="forms" :model="form" :rules="rules" label-width="140px">
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="65%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="录单单位名称" prop="lddwmc">
               <el-input v-model="form.lddwmc"></el-input>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="进出口标志" prop="jckbz">
               <el-input v-model="form.jckbz"></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="进出口日期" prop="jckrq">
+              <!-- <el-input v-model="form.jckrq"></el-input> -->
               <el-date-picker
+                style="width: 100%"
                 v-model="form.jckrq"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -165,18 +167,60 @@
               >
               </el-date-picker>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="净重" prop="jz">
               <el-input v-model="form.jz"></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="净值" prop="jingzhi">
               <el-input v-model="form.jingzhi"></el-input>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="件数" prop="js">
               <el-input v-model="form.js"></el-input>
             </el-form-item>
-
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="境内收发货人标号" prop="jnsfhrbh">
+              <el-input v-model="form.jnsfhrbh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="境内收发货人名称 " prop="jnsfhrmc">
+              <el-input v-model="form.jnsfhrmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="境外发货人代码 " prop="jwfhrdm">
+              <el-input v-model="form.jwfhrdm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="境外收发货人名称   " prop="jwsfhrmc">
+              <el-input v-model="form.jwsfhrmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="境外收发货人地址   " prop="jwsfhrdz">
+              <el-input v-model="form.jwsfhrdz"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="启运日期  " prop="qyrq">
+              <!-- <el-input v-model="form.qyrq"></el-input> -->
               <el-date-picker
+                style="width: 100%"
                 v-model="form.qyrq"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -184,9 +228,14 @@
               >
               </el-date-picker>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="卸毕日期   " prop="xbrq">
-              <!-- <el-input v-model="form.xbrq"></el-input> -->
+<!--              <el-input v-model="form.xbrq"></el-input>-->
               <el-date-picker
+                style="width: 100%"
                 v-model="form.xbrq"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -194,39 +243,40 @@
               >
               </el-date-picker>
             </el-form-item>
-
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="报关单币种统计   " prop="bgdbztj">
               <el-input v-model="form.bgdbztj"></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="申报单位名称   " prop="sbdwmc">
               <el-input v-model="form.sbdwmc"></el-input>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="录单单位编码名称   " prop="lddwbmmc">
               <el-input v-model="form.lddwbmmc"></el-input>
             </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane label="境内外信息" name="second">
-          <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-            <el-form-item label="境内收发货人标号" prop="jnsfhrbh">
-              <el-input v-model="form.jnsfhrbh"></el-input>
-            </el-form-item>
-            <el-form-item label="境内收发货人名称 " prop="jnsfhrmc">
-              <el-input v-model="form.jnsfhrmc"></el-input>
-            </el-form-item>
-            <el-form-item label="境外发货人代码 " prop="jwfhrdm">
-              <el-input v-model="form.jwfhrdm"></el-input>
-            </el-form-item>
-            <el-form-item label="境外收发货人名称   " prop="jwsfhrmc">
-              <el-input v-model="form.jwsfhrmc"></el-input>
-            </el-form-item>
-            <el-form-item label="境外收发货人地址   " prop="jwsfhrdz">
-              <el-input v-model="form.jwsfhrdz"></el-input>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-      </el-tabs>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"></el-col>
+          <el-col :span="12"></el-col>
+        </el-row>
+
+
+
+        <!-- <el-form-item label="供应链主键  " prop="id">
+          <el-input v-model="form.id"></el-input>
+        </el-form-item>
+        <el-form-item label="保税区主键  " prop="deptId">
+          <el-input v-model="form.deptId"></el-input>
+        </el-form-item> -->
 
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>