liyg 2 年之前
父节点
当前提交
6d3a86b6b7

+ 2 - 2
src/views/TMS/components/importedShip/addLoadShip.vue

@@ -163,7 +163,7 @@ export default {
         resultActualInstallations: this.form.resultActualInstallations,
         resultLoadShipDate: sjTime(this.form.resultLoadShipDate),
         resultIsClear: this.form.resultIsClear,
-        resultArrivalTime: sjTime(this.form.resultArrivalTime),
+        resultArrivalTime: sjTime(this.form.resultLoadShipDate),
         resultOutWharyName: this.form.resultOutWharyName,
         resultOutWharyTime: sjTime(this.form.resultOutWharyTime),
         resultMemo: this.form.resultMemo,
@@ -176,7 +176,7 @@ export default {
         moistureTonnage: this.moistureTonnage,
         waterUnitPrice:this.form.waterUnitPrice,
         unitPriceId:this.form.unitPriceId,
-        //isNeedAssemble:this.form.isNeedAssemble,
+        isNeedAssemble:this.form.isNeedAssemble,
         userId: getCookie("userId"),
       };
       console.log("mapVal:",mapVal);

+ 9 - 2
src/views/TMS/components/importedShip/updateLoadShip.vue

@@ -5,6 +5,12 @@
     <div class="form">
       <div class="form_box">
           <dil-form :formId="136" v-model="form1" ref="from1"></dil-form>
+          <el-form :inline="true">
+          <el-form-item label="是否拼装" >
+            <el-radio v-model="form1.isNeedAssemble" label="否" style="margin-left :10px">否</el-radio>
+            <el-radio v-model="form1.isNeedAssemble" label="是">是</el-radio>
+          </el-form-item>
+        </el-form>
       </div> 
     </div>
     <!-- 确定和取消 -->
@@ -62,6 +68,7 @@ export default {
         resultActualInstallations: this.form1.resultActualInstallations,
         outWharyResultId:this.outWharyResultId,
         // rwarehouseMaterialId: this.form1.rwarehouseMaterialId,
+        isNeedAssemble:this.form1.isNeedAssemble,
         resultArrivalPortTime: sjTime(
           this.form1.resultArrivalPortTime
         ),
@@ -75,7 +82,7 @@ export default {
         resultOutPortName:this.form1.resultOutPortName,
         //planDate:sjTime(this.form1.planDate),
         //planDeliveryDate:sjTime(this.form1.planDeliveryDate),
-        //resultHeavyWeight:this.form1.resultHeavyWeight,
+        resultHeavyWeight:this.form1.resultHeavyWeight,
         userId:getCookie("userId"),
       };
               //判断放货数量是否为数字
@@ -94,7 +101,7 @@ export default {
     
       this.axios
         .post(
-          "/api/v1/tms/updateLoadShip",
+          "/api/v1/tms/updateThreeSectionDetails",
           mapVal
         )
         .then((res) => {