Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/TMS/components/importedShip/shipLocation.vue

@@ -31,9 +31,6 @@
         <template slot="scope" v-if="item.label !== '位置状态'">
           <span>{{ item.label }}</span>
         </template>
-        <template slot="scope" v-if="item.label !== '日期'">
-          <span>{{ item.label }}</span>
-        </template>
         <!-- 插入输入框 -->
         <template slot-scope="scope">
           <template v-if="item.slot">
@@ -49,6 +46,7 @@
             <template v-if="item.prop == 'locationStatus'">
               <el-select
                 v-model.number="scope.row.locationStatus"
+                @change="click(scope.row)"
                 placeholder="请选择"
               >
                 <el-option
@@ -60,15 +58,7 @@
                 </el-option>
               </el-select>
             </template>
-            <!-- 日期 -->
-            <template v-if="item.prop == 'locationRouteTime'">
-              <el-date-picker
-                type="date"
-                v-model.number="scope.row.locationRouteTime"
-                style="width: 150px"
-                :clearable="false"
-              ></el-date-picker>
-            </template>
+           
           </template>
 
           <template v-else>
@@ -134,8 +124,7 @@ export default {
         {
           prop: "locationRouteTime",
           label: "离港日期",
-          width: "200",
-          slot: true,
+          width: "100",
         },
         {
           prop: "startPortName",
@@ -188,16 +177,19 @@ export default {
   },
   methods: {
     onblur(scope) {
-      // console.log("我是交了");
-      // console.log(scope);
       this.axios
         .post(
           "/api/v1/tms/getShipLocationStatus?shipLocation=" +
             scope.row.shipLocation
         )
         .then((res) => {
-          // console.log(res.data.data);
-          scope.row.locationStatus = res.data.data.locationStatus;
+          console.log("locationStatus：",res.data.data);
+          try {
+            scope.row.locationStatus = res.data.data.locationStatus;
+          } catch (error) {
+            
+          }
+          this.click(scope.row);
         });
     },
     initialization() {

src/views/appoint/components/ship/addDeliveryAttorney.vue

@@ -103,7 +103,7 @@ export default {
       drawer: false,
       direction: "rtl",
       options: {
-        requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=383",
+        requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=375",
         selectionType: "radio",
         maplist: [],
       },
@@ -124,9 +124,13 @@ export default {
     },
   },
   created() {
+    let attorneyTime = new Date();
+    attorneyTime.setHours(0);
+    attorneyTime.setMinutes(0);
+    attorneyTime.setSeconds(0);
     this.form1 = {
       downSwimPortId: 11,
-      attorneyTime: new Date(),
+      attorneyTime: attorneyTime,
     };
   },
   mounted() {

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -69,6 +69,21 @@
           ref="from1"
           @change="onchange"
         ></dil-form>
+        <el-form>
+          <div class="preview-group">
+            <el-form-item label="备注:">
+              <el-select v-model="form1.resultMemo" placeholder="必选" filterable>
+                <el-option
+                  v-for="resultMemo in resultMemos"
+                  :key="resultMemo"
+                  :label="resultMemo"
+                  :value="resultMemo"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-form>
       </div>
       <!-- <div class="liulan">
         <el-button type="primary" class="btn" @click="ondrawer(4)">浏览</el-button>
@@ -217,6 +232,7 @@ export default {
   data() {
     return {
       isLoading: false,
+      resultMemos:['低富粉','中富粉','高富粉','机精粉','进口块矿'],
       a: 1,
       cargoPictureUrl: "",
       shippingCertificate: "",
@@ -513,7 +529,8 @@ export default {
         map.groupId == null ||
         map.isNeedPortDisCharge == null ||
         map.isNeedPortFee == null ||
-        map.isNeedBonded == null
+        map.isNeedBonded == null ||
+        map.resultMemo == null
       ) {
         this.$message.error("存在空值！");
         this.isLoading = false;

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -198,7 +198,7 @@ export default {
         console.log("table_book:",table_book);
         console.log("sheet:",table_book.Sheets.Sheet1);
         //限制单元格样式范围
-        let rangeList=['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q',,'R','S','T','U','V']
+        let rangeList=['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q',,'R','S','T','U']
         //得到自定义过滤数组
         let filterList=this.exportFilter(table_book.Sheets.Sheet1);
         console.log("filterList:",filterList);

src/views/statisticalReport/components/tableItem.vue

@@ -2,7 +2,7 @@
   <div>
     <table v-show="false">
       <tr>
-        <td colspan="18">达州钢铁每日船舶动态明细表</td>
+        <td colspan="17">达州钢铁每日船舶动态明细表</td>
         <td colspan="4">{{deadline}}</td> 
       </tr>
     </table>
@@ -87,16 +87,16 @@
         <!-- 库存表 -->
         <table v-show="false">
           <tr>
-            <td colspan="22">{{ downStockString }}</td>
+            <td colspan="21">{{ downStockString }}</td>
           </tr>
           <tr>
-            <td colspan="22">{{ stockString }}</td>
+            <td colspan="21">{{ stockString }}</td>
           </tr>
           <tr>
-            <td colspan="22">{{ runStockString }}</td>
+            <td colspan="21">{{ runStockString }}</td>
           </tr>
           <tr>
-            <td colspan="22"></td>
+            <td colspan="21"></td>
           </tr>
         </table>