css

07a51ad1 · LJM · a07959a1 · 07a51ad1
Commit 07a51ad1 authored Feb 18, 2023 by LJM
Showing with 45 additions and 106 deletions
src/views/OrderTrack/returnGoods.vue
--- a/src/views/OrderTrack/returnGoods.vue
+++ b/src/views/OrderTrack/returnGoods.vue
@@ -15,13 +15,17 @@
        <el-form-item label="状态" prop="status">
          <el-select v-model="formInline.status" placeholder="请选择">
            <el-option label="全部" value=""></el-option>
-            <el-option label="待到货" value="1"></el-option>
-            <el-option label="完成" value="2"></el-option>
            <el-option label="作废" value="-3"></el-option>
+            <el-option label="待提审" value="-2"></el-option>
+            <el-option label="待审核" value="-1"></el-option>
+            <el-option label="待退货入库" value="1"></el-option>
+            <el-option label="待付款退款" value="2"></el-option>
+            <el-option label="完成" value="3"></el-option>
+            <el-option label="待同步金蝶" value="4"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="退货时间">
-          <el-date-picker v-model="formInline.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-date-picker v-model="create_time_val" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="submit">查询</el-button>
@@ -30,9 +34,7 @@
      </el-form>
      <!--操作区-->
      <div class="operation-area row verCenter bothSide">
-        <div class="operation-button row verCenter">
+        <div class="operation-button row verCenter"></div>
-        </div>
        <div class="text-tip row verCenter">
          <i class="el-icon-warning"></i>
          <span>该页面展示的数据为：猎芯客户与我司产生的订单退货数据</span>
@@ -42,15 +44,25 @@
      <div class="data-box th-all" v-if="tableData">
        <el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
          <el-table-column prop="stock_in_sn" label="对应发货单" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="stock_in_sn" label="状态" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="status_val" label="状态" width="100" :show-overflow-tooltip="true" align="center">
+            <template slot-scope="scope">
+              <el-tag type="danger" v-if="scope.row.status==-3">作废</el-tag>
+              <el-tag type="primary" v-else-if=" scope.row.status==-2">待提审</el-tag>
+              <el-tag type="primary" v-else-if=" scope.row.status==-1">待审核</el-tag>
+              <el-tag type="primary" v-else-if=" scope.row.status==1">待退货入库</el-tag>
+              <el-tag type="warning" v-else-if=" scope.row.status==2">待付款退款</el-tag>
+              <el-tag type="success" v-else-if="scope.row.status==3">完成</el-tag>
+              <el-tag v-else-if="scope.row.status==4">待同步金蝶</el-tag>
+            </template>
+          </el-table-column>
          <el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
          <el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
          <el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="in_qty" label="退货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="return_qty" label="退货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="status_val" label="单价" min-width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="return_in_tax" label="单价" min-width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="shipping_name" label="退货总价" min-width="80" align="center"></el-table-column>
+          <el-table-column prop="refund_in_tax" label="退货总价" min-width="80" align="center" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column prop="create_name" label="批次" min-width="100" align="center"></el-table-column>
+          <el-table-column prop="wms_batch_sn" label="批次" min-width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column prop="create_time" label="退货时间" width="150" align="center"></el-table-column>
+          <el-table-column prop="create_time" label="退货时间" width="160" align="center" :show-overflow-tooltip="true"></el-table-column>
        </el-table>
        <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
      </div>
@@ -61,7 +73,7 @@
 <script>
 import Vue from 'vue';
 import Menu from "@/components/menu.vue";
-import {Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Select, Table, TableColumn, Tag} from 'element-ui'
+import {Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn, Tag} from 'element-ui'
 Vue.prototype.$message = Message;
 Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
@@ -74,9 +86,9 @@ export default {
      limit: 10,
      page: 1,
      dialogVisible: false,
-      logs: [],
+      create_time_val: '',
      formInline: {
-        date: '',
+        create_time: '',
        stock_in_sn: "",
        goods_name: '',
        brand_name: '',
@@ -89,17 +101,16 @@ export default {
  created() {
    this.getData();
  },
-  computed: {},
  methods: {
    getData() {
-      this.$http('post', "/api/purchase/getDeliveryList", {
+      //格式化时间
-        page: this.page,
+      if (this.create_time_val) {
-        limit: this.limit,
+        this.formInline.create_time = this.create_time_val[0] + '~' + this.create_time_val[1];
-        stock_in_sn: this.formInline.stock_in_sn,
+      } else {
-        brand_name: this.formInline.brand_name,
+        this.formInline.create_time = '';
-        goods_name: this.formInline.goods_name,
+      }
-        status: this.formInline.status,
+      var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formInline)
-      }).then(res => {
+      this.$http('post', "/api/purchase/getReturnMaterialList", params).then(res => {
        if (res.code === 0) {
          this.tableData = res.data.list || [];
          this.total = Number(res.data.total) || 0;
@@ -127,22 +138,6 @@ export default {
    handleSelectionChange(val) {
      this.multipleSelection = val;
    },
-    getLogs(obj_type, obj_id) {
-      this.$http('GET', "/api/log/getLogs", {
-        obj_type: obj_type,
-        obj_id: obj_id
-      }).then(res => {
-        if (res.code === 0) {
-          this.dialogVisible = true;
-          this.logs = res.data.list;
-        } else {
-          this.$message({
-            message: res.msg,
-            type: 'warning'
-          });
-        }
-      });
-    },
    submit() {
      this.page = 1;
      this.getData();
@@ -150,71 +145,11 @@ export default {
    resetForm(formName) {
      this.$refs[formName].resetFields();
    },
-    //取消发货
+    /**
-    cancelSend() {
+     * 搜索型号
-      var self = this;
+     * @param queryString
-      if (this.multipleSelection.length <= 0) {
+     * @param cb
-        this.$message({
+     */
-          message: "请勾选数据进行操作",
-          type: 'warning'
-        });
-        return false;
-      }
-      let stock_in_ids = [];
-      stock_in_ids = this.multipleSelection.map(obj => {
-        return obj.stock_in_id;
-      })
-      let source_arr = [];
-      let status_arr = [];
-      source_arr = this.multipleSelection.map(obj => {
-        return obj.source;
-      })
-      status_arr = this.multipleSelection.map(obj => {
-        return obj.status;
-      })
-      let source = source_arr.every(ele => ele === 2)
-      if (source) {
-        //待入库
-        let status = status_arr.every(ele => ele === 1)
-        if (status) {
-          MessageBox.confirm('确定取消发货吗？', {
-            type: 'error'
-          }).then(() => {
-            this.$http('POST', "/api/purchase/cancelSupDelivery", {stock_in_ids: stock_in_ids.join(',')}).then(res => {
-              if (res.code == 0) {
-                this.$message({
-                  message: "操作成功",
-                  type: 'success',
-                  duration: 2000,
-                  onClose() {
-                    self.getData();
-                  }
-                });
-              } else {
-                this.$message({
-                  message: res.msg,
-                  type: 'error'
-                });
-              }
-            })
-          }).catch(() => {
-          })
-        } else {
-          this.$message({
-            message: '请选择待入库状态',
-            type: 'warning'
-          });
-        }
-      } else {
-        this.$message({
-          message: '请选择创建人为自己的发货单',
-          type: 'warning'
-        });
-      }
-    },
-    //型号
    querySearchAsync(queryString, cb) {
      this.$http('get', "/api/search/getspu", {
        spu_name: queryString
@@ -235,7 +170,11 @@ export default {
        }
      })
    },
-    //品牌
+    /**
+     * 搜索品牌
+     * @param queryString
+     * @param cb
+     */
    querySearchAsyncBrand(queryString, cb) {
      this.$http('get', "/api/brand/get_stand_brand", {
        brand: queryString