Ver código fonte

修改装机备注

zx 3 anos atrás
pai
commit
7d0f88ec25

+ 1 - 1
config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http:///172.16.33.166:8080",
     // target: "http://192.168.1.115:8019",
     ws: true,
     pathRewrite: {

+ 1 - 1
src/views/TMS/components/importedShip/updateShipmentInstructions.vue

@@ -56,7 +56,7 @@ export default {
     onClickConfirm() {
       let omsshipShipmentInstructions = {
         shipmentInstructionsId:this.$route.params.instructionsId,
-        batchId: this.form1.batchId,
+        // batchId: this.form1.batchId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(
           this.form1.instructionTime

+ 10 - 25
src/views/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -4,7 +4,7 @@
     <page-title>返回</page-title>
     <div class="form">
       <div class="form_box">
-          <dil-form :formId="228" v-model="form1"></dil-form>
+          <dil-form :formId="113" v-model="form1"></dil-form>
       </div>        
     </div>
     <!-- 确定和取消 -->
@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from '../../../ADMINISTRATORS/app';
 export default {
   components: { PageTitle },
     data(){
@@ -44,33 +45,17 @@ export default {
     },
      // 确认
     onClickConfirm() {
-      let mes = {
-        resultId: this.$route.params.resultId,
-        batchId: this.form1.batchId,
+      let AmsshipDeliveryAttorney = {
+        resultId: this.$route.params.attorneyId,
         portId: this.form1.portId,
-        resultMaterialNumber: this.form1.resultMaterialNumber
+        attorneyContactTelephone:this.form1.attorneyContactTelephone,
+        attorenyPickupIdcard:this.form1.attorenyPickupIdcard,
+        attorneyPickupContactPerson:this.form1.attorneyPickupContactPerson,
+        downSwimPortId:this.form1.downSwimPortId,
+        attorneyTime:sjTime(this.form1.attorneyTime),
       };
-      function isNumber() {
-        var value = mes.resultMaterialNumber;
-        //验证是否为数字
-        var patrn = /^(-)?\d+(\.\d+)?$/;
-        if (patrn.exec(value) == null || value == "") {
-          return false;
-        } else {
-          return true;
-        }
-      }
-      var val = this.value;
-      if (
-        mes.batchId==null||
-        mes.portId==null||
-        mes.resultMaterialNumber==null
-      ) this.$message.error("存在空值!");
-      else
-      if (!isNumber(val)) this.$message.error("物资件数必须是数字");
-      else
       this.axios
-        .post("/api/v1/tms/editDeliveryAttroney" , AmsshipDeliveryAttorney
+        .post("/api/v1/tms/editDeliveryAttroney",AmsshipDeliveryAttorney
         )
         .then(() => {
           this.$message({

+ 3 - 2
src/views/appoint/components/ship/modifyDeliveryNotice.vue

@@ -17,6 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
     data(){
@@ -36,7 +37,7 @@ export default {
           res.data.data.forEach((e) => {
             this.form1 = e;
             console.log(e);
-            console.log(this.form1);
+            console.log("aaa" +this.form1);
             console.log(this.$route.params.pathId);
           });
           
@@ -88,7 +89,7 @@ export default {
       // else
       // if (!isNumber(val)) this.$message.error("联系电话必须是数字!");
       // else
-      
+      console.log("AmsshipDeliveryNotice",AmsshipDeliveryNotice);
       this.axios
         .post("/api/v1/tms/editDeliveryNotice" ,AmsshipDeliveryNotice
         )

+ 6 - 0
src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -333,6 +333,12 @@ export default {
         }, {
           value: '烧结矿',
           label: '烧结矿'
+        },{
+          value: '打堆、装车',
+          label: '打堆、装车'
+        },{
+          value: '回收废旧物资',
+          label: '回收废旧物资'
         }],
         installremark: '',
       options: [],