调整订单列表 修改沽清为多选

src/views/orders/mealorderinfo.vue

@@ -379,8 +379,8 @@ export default {
     onChange(e, dateString) {
       // console.log("Selected Time: ", e);
       // console.log("Formatted Selected Time: ", dateString);
-      this.queryParam.startDate = dateString[0];
-      this.queryParam.endDate = dateString[1];
+      this.queryParam.startTime = dateString[0];
+      this.queryParam.endTime = dateString[1];
     },
     initDictConfig() {},
     getSuperFieldList() {

src/views/orders/modules/mealOrderModals/mealOrderInfoModalForm.vue

@@ -106,11 +106,11 @@
             dataIndex: "",
             scopedSlots: { customRender: "goodsName" }
           },
-          {
-            title: "订单号",
-            align: "center",
-            dataIndex: "orderCode",
-          },
+          // {
+          //   title: "订单号",
+          //   align: "center",
+          //   dataIndex: "orderCode",
+          // },
           {
             title: "价格",
             align: "center",

src/views/settings/components/pos/modules/PosThaliForm.vue

@@ -250,7 +250,12 @@ export default {
         this.$set(t, "required", false);
         this.$set(t, "num", 1);
       });
-      this.model.posThaliInGoodsList = e;
+      //判断两个数组中是否有id相同的元素
+      if (this.model.posThaliInGoodsList.some((t) => e.some((ele) => ele.id == t.id))) {
+        this.$message.warning("请勿重复添加");
+        return;
+      }
+      this.model.posThaliInGoodsList = this.model.posThaliInGoodsList.concat(e);
     },
     handleAdd() {
       this.$refs.modalForm2.edit({

src/views/settings/components/pos/posSellClearGoods.vue

@@ -41,8 +41,8 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button v-if="sellClear == 1" @click="handleAdd">立即沽清</a-button>
-      <a-button v-if="sellClear == 2" @click="handleDelete">取消沽清</a-button>
+      <a-button @click="handleAdd">立即沽清</a-button>
+      <a-button @click="handleDelete">取消沽清</a-button>
     </div>
 
     <div>
@@ -151,8 +151,20 @@ export default {
   },
   methods: {
     handleDelete() {
+
+      let selectArr = this.dataSource.filter((t) => t.sort == 888888)
+      if (!selectArr.length) {
+        this.$message.warning("请选择取消沽清商品");
+        return
+      }
+      if (selectArr.some(ele=>!ele.isSellClear)) {
+        this.$message.warning("未沽清商品不能取消沽清");
+        return
+      }
+      let modelArr = selectArr.map(ele=>ele.id)
+      console.log(modelArr);
       deleteAction("/pos/posSellClearGoods/delete", {
-        goodsId: this.selectGoods.id,
+        goodsId: modelArr.join(",")
       })
         .then((res) => {
           if (res.success) {
@@ -171,7 +183,19 @@ export default {
       if (_info) {
         model.hotelId = _info.id;
       }
-      postAction("/pos/posSellClearGoods/add", model)
+      console.log(model,this.dataSource);
+      let selectArr = this.dataSource.filter((t) => t.sort == 888888)
+      if (!selectArr.length) {
+        this.$message.warning("请选择沽清商品");
+        return
+      }
+      if (selectArr.some(ele=>ele.isSellClear)) {
+        this.$message.warning("已沽清商品不能重复沽清");
+        return
+      }
+      let modelArr = selectArr.map(ele=>({ goodsId: ele.id,hotelId:_info.id }))
+      console.log(modelArr);
+      postAction("/pos/posSellClearGoods/add", modelArr)
         .then((res) => {
           if (res.success) {
             this.$message.success(res.message);
@@ -187,10 +211,10 @@ export default {
       console.log(row);
       if (row.sort != 888888) {
         this.selectGoods = row;
-        var list = this.dataSource.filter((t) => (t) => t.sort == 888888);
-        list.forEach((t) => {
-          t.sort = 0;
-        });
+        // var list = this.dataSource.filter((t) => (t) => t.sort == 888888);
+        // list.forEach((t) => {
+        //   t.sort = 0;
+        // });
         row.sort = 888888;
         if (row.isSellClear) {
           this.sellClear = 2;