Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/shipment-details/declareElementsModal.vue

@@ -18,24 +18,56 @@
                   {{ declareElements.id }}
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="8" style="display: none;">
+                <a-form-model-item label="账套" prop="acSetNo">
+                  {{ declareElements.acSetNo }}
+                </a-form-model-item>
+              </a-col>
+
+            <a-col :md="6" :sm="8" style="display: none;">
+                <a-form-model-item label="款号" prop="itemNumber">
+                  {{ declareElements.itemNumber }}
+                </a-form-model-item>
+              </a-col>
+                <a-col :md="6" :sm="8" style="display: none;">
+                <a-form-model-item label="存货名称" prop="inventoryName">
+                  {{ declareElements.inventoryName }}
+                </a-form-model-item>
+              </a-col>
+
+            <a-col :md="6" :sm="8">
+                <a-form-model-item label="报关品名" prop="declarationName">
+                  <a-input placeholder="请输入报关品名" v-model="declareElements.declarationName"></a-input>
+                </a-form-model-item>
+             </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="报关品名" prop="declarationName">
                   {{ declareElements.declarationName }}
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
+             <a-col :md="6" :sm="8">
+                <a-form-model-item label="HSCODE" prop="hsCode">
+                  <a-input placeholder="请输入HSCODE" v-model="declareElements.hsCode"></a-input>
+                </a-form-model-item>
+             </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="HSCODE" prop="hsCode">
                   {{ declareElements.hsCode }}
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
+                <a-col :md="6" :sm="8">
+                <a-form-model-item label="英文品名" prop="englishProductName">
+                  <a-input placeholder="请输入英文品名" v-model="declareElements.englishProductName"></a-input>
+                </a-form-model-item>
+             </a-col>
 
-              <a-col :md="6" :sm="8">
+              <!-- <a-col :md="6" :sm="8">
                 <a-form-model-item label="英文品名" prop="englishProductName">
                   {{ declareElements.englishProductName }}
                 </a-form-model-item>
-              </a-col>
+              </a-col> -->
             </a-row>
           </a-form-model>
         </div>
@@ -199,6 +231,9 @@ export default {
       newObj.declarationName = this.declareElements.declarationName //报关品名
       newObj.hsCode = this.declareElements.hsCode //报关品名
       newObj.englishProductName = this.declareElements.englishProductName //英文品名
+      newObj.acSetNo = this.declareElements.acSetNo //账套
+      newObj.inventoryName = this.declareElements.inventoryName //物料名称
+      newObj.itemNumber = this.declareElements.itemNumber //款号
       // 新增子表
       newObj.syDeclarationElementsItemList = this.declareElementsData
       // newDeclareElement.documentNo = this.addShipDet.documentNo // 单据号