订单和预装箱单修改

src/views/advance-packingList/adPaList-clothes.vue

@@ -191,11 +191,6 @@
         @ok="modalFormOk"
       ></addAdpacking-drawer>
 
-      <editAdpacking-drawer
-        ref="editAdpackingDrawer"
-        :fatherList="getadPaListClothes"
-        @ok="modalFormOk"
-      ></editAdpacking-drawer>
 
       <detailsAdpacking-drawer ref="detailsAdpackingDrawer" @ok="modalFormOk"></detailsAdpacking-drawer>
     </div>
@@ -208,14 +203,13 @@ import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 import addAdpackingDrawer from '@views/advance-packingList/addAdpackingDrawer.vue'
 import detailsAdpackingDrawer from '@views/advance-packingList/detailsAdpackingDrawer.vue'
-import editAdpackingDrawer from '@views/advance-packingList/editAdpackingDrawer.vue'
 
 import { getadPaList, itemByMainId } from '@api/document/advance-packingList.js'
 
 export default {
   productName: 'AdPaListClothes', // 预装箱单-成衣
   mixins: [JeecgListMixin],
-  components: { JEllipsis, moment, addAdpackingDrawer, detailsAdpackingDrawer, editAdpackingDrawer },
+  components: { JEllipsis, moment, addAdpackingDrawer, detailsAdpackingDrawer },
 
   data() {
     let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
@@ -440,11 +434,10 @@ export default {
       itemByMainId({id:record.id}).then(res => {
         if (res.success) {
           console.log(res.result);
-          this.$refs.editAdpackingDrawer.addAdpacking = res.result; //接口参数
-          this.$refs.editAdpackingDrawer.visible = true;
-          // this.$refs.detailsAdpackingDrawer.visible = true
           
-          //this.$refs.editAdpackingDrawer.getEditInfo()
+          this.$refs.addAdpackingDrawer.visible = true;
+          this.$refs.addAdpackingDrawer.addAdpacking = res.result; //接口参数
+          
         }else{
           this.$message.error("获取记录详情失败");
         }

src/views/advance-packingList/addAdpackingDrawer.vue

@@ -159,9 +159,12 @@
         <a-popconfirm title="确定放弃新增？" @confirm="handleCancel" okText="确定" cancelText="取消">
           <a-button :style="{ marginRight: '8px' }">取消</a-button>
         </a-popconfirm>
-        <a-button type="primary" @click="saveAdd">
+        <a-button type="primary" @click="myHandSave">
           保存
         </a-button>
+        <a-button type="primary" @click="myHandSubmit" style="margin-left: 8px">
+          保存并提交
+        </a-button>
       </div>
     </a-drawer>
 
@@ -171,6 +174,7 @@
       @bao="getSon"
       @ok="modalFormOk"
     ></referShipmentDetails-modal>
+
   </div>
 </template>
 
@@ -494,7 +498,15 @@ export default {
       // console.log('打开参照发运明细')
       this.$refs.referShipmentDetailsModal.referShipDetModVis = true
     },
+    myHandSave(){
+      this.addAdpacking.status=0;
+      this.saveAdd();
 
+    },
+    myHandSubmit(){
+      this.addAdpacking.status=1;
+      this.saveAdd();
+    },
     //  保存
     saveAdd() {
       var newObj = this.addAdpacking;
@@ -561,6 +573,14 @@ export default {
         }
         tableRow.sort = ++sort;
       }
+      // 日期格式转换
+      if (newObj.preDeliveryDate != "" && newObj.preDeliveryDate != undefined){
+        newObj.preDeliveryDate = newObj.preDeliveryDate+" 00:00:00";
+      }
+      // 推送状态、状态赋默认值。新增状态赋值
+      if (newObj.id == undefined || newObj.id == ""){
+          newObj.push_status = 0;
+      }
       addAdvPac(newObj).then(res => {
         if (res.success) {
           this.$message.success('新增成功')