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

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.vue

@@ -51,7 +51,7 @@
             :label="scope.row.ROW_ID"
             @click.native.prevent.stop="rowClick(scope.row)"
           >
-            {{ "" }}
+            {{ '' }}
           </el-radio>
         </template>
       </el-table-column>
@@ -117,9 +117,9 @@
 </template>
 
 <script>
-import table from "./mergeRowTable.js";
+import table from './mergeRowTable.js'
 export default {
-  name: "MergeRowTable",
+  name: 'MergeRowTable',
   extends: table,
   props: {
     // 合并行下标
@@ -128,7 +128,7 @@ export default {
     },
     //比对字段
     comparison: {
-      default: ""
+      default: ''
     },
     shiyHeigth: {
       default: null
@@ -145,18 +145,18 @@ export default {
     },
     // 请求地址
     requestUrl: {
-      default: ""
+      default: ''
     },
     // 请求参数 请求体中的参数
     requestQuery: {
       default() {
-        return {};
+        return {}
       }
     },
     // 表头数据
     columnData: {
       default() {
-        return [];
+        return []
       }
     },
     // 是否显示序号
@@ -167,7 +167,7 @@ export default {
     // radio : 显示单选框
     // select : 显示多选框
     selectionType: {
-      default: ""
+      default: ''
     },
     // 是否在数据翻页后保留之前选中的数据（需指定 row-key）
     reserveSelection: {
@@ -186,15 +186,15 @@ export default {
     // Table 的最大高度。合法的值为数字或者单位为 px 的高度。
     //sdada
     maxHeight: {
-      default: "500px"
+      default: '500px'
     },
     // 是否启用排序
     sortable: {
-      default: "custom"
+      default: 'custom'
     },
     // 对齐方式 left/center/right
     align: {
-      default: "center"
+      default: 'center'
     },
     // 是否带有纵向边框
     border: {
@@ -211,13 +211,13 @@ export default {
     // 行的 className 的回调方法，也可以使用字符串为所有行设置一个固定的 className。
     rowClassName: {
       default() {
-        return ({ row, rowIndex }) => "";
+        return ({ row, rowIndex }) => ''
       }
     },
     // 单元格的 className 的回调方法，也可以使用字符串为所有单元格设置一个固定的 className。
     cellClassName: {
       default() {
-        return ({ row, rowIndex }) => "";
+        return ({ row, rowIndex }) => ''
       }
     },
     loading: {
@@ -234,7 +234,7 @@ export default {
     // 每页显示个数选择器的选项设置
     pageSizes: {
       default() {
-        return [10, 20, 50, 100, 200, 1000];
+        return [10, 20, 50, 100, 200, 1000]
       }
     },
     // 每页显示条目个数，支持 .sync 修饰符
@@ -243,36 +243,36 @@ export default {
     },
     //组件布局，子组件名用逗号分隔
     layout: {
-      default: "total, prev, pager, next, sizes, jumper"
+      default: 'total, prev, pager, next, sizes, jumper'
     }
   },
   watch: {
     requestUrl() {
-      this.refreshData();
+      this.refreshData()
     },
     drawer(val) {
       if (val) {
-        this.dataRadioId = null;
+        this.dataRadioId = null
       }
     }
   },
   methods: {
     // 刷新表格数据
     refreshData() {
-      this.requestData();
+      this.requestData()
       // 多选表格清空用户的选择
-      this.$refs.mainTable.clearSelection();
+      this.$refs.mainTable.clearSelection()
     },
     rowDbClick(row) {
-      console.log(row);
-      console.log("我被双击了");
-      this.$emit("rowDbClick", row);
+      console.log(row)
+      console.log('我被双击了')
+      this.$emit('rowDbClick', row)
     },
     toggleRowExpansion(row, expanded) {
-      this.$refs.mainTable.toggleRowExpansion(row, expanded);
+      this.$refs.mainTable.toggleRowExpansion(row, expanded)
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -289,4 +289,13 @@ export default {
   font-size: 22px;
   font-weight: 700;
 }
+
+::-webkit-scrollbar {
+  width: 0px;
+  height: 0px;
+}
+::-webkit-scrollbar-thumb {
+  background-color: #dbd9d9;
+  border-radius: 3px;
+}
 </style>

src/views/appoint/components/saleContract/saleOrderCoproductCarrier.vue

@@ -17,7 +17,7 @@
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="coproductSendClick(scope.row.saleOrderId)"
+                @click="coproductSendClick(scope.row)"
                 type="text"
                 size="small"
                 >副产品派车</el-button
@@ -55,111 +55,122 @@
   </div>
 </template>
 <script>
-import { getCookie } from "@/utils/util.js";
+import { getCookie } from '@/utils/util.js'
 export default {
-  name: "saleOrder",
+  name: 'saleOrder',
   data() {
     return {
-      activeName: "four",
-      input: "",
+      activeName: 'four',
+      input: '',
       carrierId: null,
       carrierName: null,
       option4: {
         // 表格请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       //记录旧的row对象 (销售公司已审批)
-      oldRow: "",
+      oldRow: '',
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (销售公司已审批)
       oldRowCount: 1,
       tableHead: [
         {
-          prop: "materialName",
-          label: "物资名称",
+          prop: 'materialName',
+          label: '物资名称',
           width: 150
         },
         {
-          prop: "specificationModel",
-          label: "规格型号",
+          prop: 'specificationModel',
+          label: '规格型号',
           width: 150
         },
         {
-          prop: "materialNumber",
-          label: "物资件数",
+          prop: 'materialNumber',
+          label: '物资件数',
           width: 100
         },
         {
-          prop: "materialWeight",
-          label: "物资重量",
+          prop: 'materialWeight',
+          label: '物资重量',
           width: 100
         }
       ],
       //(销售公司已审批)
       tableData: []
-    };
+    }
   },
   created() {
-    this.initUrl();
+    this.initUrl()
   },
   methods: {
     initUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409&carrierSsoId=" +
-          getCookie("userId");
+          '/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409&carrierSsoId=' +
+          getCookie('userId')
       } else {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409";
+          '/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409'
       }
     },
     refresh() {
-      this.$router.go(0);
+      this.$router.go(0)
     },
     handleClick(tab, event) {
-      console.log(tab, event);
+      console.log(tab, event)
     },
     onclick() {
-      if (this.activeName == "four") {
+      if (this.activeName == 'four') {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
-          this.input;
+          '/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=' +
+          this.input
       }
     },
-    coproductSendClick(saleOrderId) {
-      this.$router.push("/addSaleOrderCoproductSendCarrier/" + saleOrderId);
+    coproductSendClick(row) {
+      this.$router.push('/addSaleOrderCoproductSendCarrier/' + row.saleOrderId)
+      // this.axios
+      //   .post('/api/v1/ams/getSaleOrderStatus?saleNumber=' + row.saleNumber)
+      //   .then(res => {
+      //     console.log(res.data.data)
+      //     if (res.data.data == 7) {
+      //       this.$message.error('该订单在金蝶已关闭,无法派车')
+      //       return
+      //     } else {
+
+      //     }
+      //   })
     },
     // -------查看物资详情 (已审批)
     detailclick(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {
-        this.oldRowCount += 1;
+        this.oldRowCount += 1
       }
       // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
+      this.$refs.table.toggleRowExpansion(row)
       // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
+      if (this.oldRow != '') {
         if (this.oldRow != row) {
           if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
+            this.$refs.table.toggleRowExpansion(this.oldRow)
           } else {
-            this.oldRowCount = 1;
+            this.oldRowCount = 1
           }
         } else {
-          this.oldRow = null;
-          return;
+          this.oldRow = null
+          return
         }
       }
       // 重置上一个点击对象
-      this.oldRow = row;
+      this.oldRow = row
       // 根据销售订单id查询物资信息
       this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
+        .post('/api/v1/ams/getSaleMaterialList?saleOrderId=' + row.saleOrderId)
         .then(res => {
-          this.tableData = res.data.data;
-        });
+          this.tableData = res.data.data
+        })
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .salePlan {

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -460,7 +460,8 @@ export default {
           opacity: 0.8, //滚动条透明度
           "overflow-x": "hidden"
         }
-      }
+      },
+      time2:null
     };
   },
   computed: {
@@ -818,7 +819,6 @@ export default {
       // console.log("进来了");
       // console.log(this.whether);
       // console.log(this.installremark);
-
       if (this.tableData.length > 1 && this.form.requirementType != "倒库") {
         this.$message.warning("非倒库需求只允许填写一个物资");
         return;
@@ -885,18 +885,6 @@ export default {
         this.disabled = false;
         return;
       }
-      if (this.DueTime == null && this.isOpenDueTime == false) {
-        //默认选择明天0点
-        var dd = new Date();
-        dd.setDate(dd.getDate()+1);//获取AddDayCount天后的日期
-        dd.setHours(null);
-        dd.setMinutes(null);
-        dd.setSeconds(null);
-        var y = dd.getFullYear();
-        var m = dd.getMonth()+1;//获取当前月份的日期
-        var d = dd.getDate();
-        this.DueTime=dd;
-      }
       if (this.DueTime == null) {
         DueTime = null;
       } else {
@@ -916,6 +904,15 @@ export default {
       if (this.form.typeRemarks == undefined) {
         this.form.typeRemarks = "";
       }
+      if (this.DueTime == null && this.isOpenDueTime == false) {
+        //默认选择明天0点
+        var dd=new Date(this.form.requirementTruckTime);
+        dd.setDate(dd.getDate()+1);//获取AddDayCount天后的日期
+        dd.setHours(null);
+        dd.setMinutes(null);
+        dd.setSeconds(null);
+        DueTime = sjTime(dd);
+      }
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
         requirementOverlimit: