Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/routerMap/index.js

@@ -294,6 +294,17 @@ const routerMap = [
       ], resolve),
   },
   {
+    path: "/cms/productionorderlist/deliverylist/deliverylistDetail",
+    name: "DeliveryListDetail", //生产订单列表-->出库表详情
+    meta: {
+      index: 4,
+    },
+    component: (resolve) =>
+      require([
+        "@/views/ProductionOrderList/Deliverylist/DeliveryDetail",
+      ], resolve),
+  },
+  {
     path: "/cms/productionorderlist/deliverylist/checkUnusual",
     name: "checkUnusual", //生产订单列表-->出库表-->查看异常
     meta: {

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -0,0 +1,569 @@
+<template>
+  <div>
+    <FullPage
+      :title=" '发货单详情'"
+      :list="list"
+      @init="init"
+      :logList="logList"
+      :loading="loading"
+      @searchData="init"
+      @changePage="changePage"
+      @changeSize="changeSize"
+      @selectTable="selectTable"
+      :tableColums="tableColums"
+      :tableData="tableData"
+      :pageIndex="pageIndex"
+      :total="total"
+    >
+      <div slot="titleButton">
+        <Button
+          v-if="$route.query.type == 2"
+          @click="handleOrderReturn(selects)"
+          type="primary"
+          style="margin-right:10px;"
+          >批量退回</Button
+        >
+        <Button @click="back" type="primary" ghost style="margin-right:10px;"
+          >返回</Button
+        >
+        <Button
+          v-if="$route.query.type == 2"
+          @click="exportData"
+          type="warning"
+          ghost
+          style="margin-right:10px;"
+          >待出库清单打印</Button
+        >
+         <Button
+          @click="outShip(selects, 1)"
+          type="warning"
+          ghost
+          style="margin-right:10px;"
+          >批量发货完成</Button
+        >
+        <Button
+          @click="outShip(selects, 2)"
+          type="success"
+          ghost
+          style="margin-right:10px;"
+          >批量收货完成</Button
+        >
+      </div>
+      <template slot-scope="{ row }" slot="set">
+        <!-- <a
+          v-if="$route.query.type == 4"
+          class="map-margin"
+          :disabled="row.order_in_no"
+          @click="confirmSuccess(row)"
+          >确认入库</a
+        >
+        <a
+          v-if="$route.query.type == 4"
+          class="map-margin"
+          :disabled="row.in_out_value == 1"
+          @click="outStock(row)"
+          >出库</a
+        >
+        <a
+          v-if="$route.query.type == 2 && !row.in_out_value"
+          class="map-margin"
+          @click="outShip(row, 1)"
+          >确认出库</a
+        >
+        <a
+          v-if="$route.query.type == 2 && row.transport_no"
+          class="map-margin"
+          @click="row.sub_state != 3 ? outShip(row, 2) : ''"
+          >{{ row.sub_state != 3 ? "运输" : "" }}</a
+        > -->
+        <a
+          class="map-margin"
+          @click="outShip([row.orders_procedure_id], 1)"
+          >{{ row.transport_no != 1 ? "发货完成" : "" }}</a
+        ><a
+          class="map-margin"
+          @click="outShip([row.orders_procedure_id], 2)"
+          >{{ row.transport_no != 1 ? "收货完成" : "" }}</a
+        >
+      </template>
+      <Modal
+        class-name="vertical-center-modal"
+        width="400"
+        title="发货指令"
+        v-model="showStock"
+        @on-ok="confirmOutStock"
+      >
+        <Form :label-width="100">
+          <FormItem label="选择人员">
+            <Select clearable v-model="info.user_id">
+              <Option
+                v-for="item of users"
+                :key="item.id"
+                :value="item.id"
+                :label="item.nickname"
+              ></Option>
+            </Select>
+          </FormItem>
+          <FormItem label="出库日期">
+            <DatePicker
+              :options="options"
+              v-model="time"
+              clearable
+              type="date"
+              placeholder="请选择日期"
+            ></DatePicker>
+          </FormItem>
+          <FormItem label="点工单形式">
+            <RadioGroup v-model="info.work_type">
+              <Radio :label="1">是</Radio>
+              <Radio :label="2">否</Radio>
+            </RadioGroup>
+          </FormItem>
+          <FormItem label="日薪" v-if="info.work_type == 1">
+            <Input v-model="info.user_salary">
+              <span slot="append">元</span>
+            </Input>
+          </FormItem>
+        </Form>
+      </Modal>
+    </FullPage>
+  </div>
+</template>
+
+<script>
+import { mapActions } from "vuex";
+export default {
+  data() {
+    return {
+      list: [
+        {
+          title: "楼幢",
+          name: "Select",
+          multiple: true,
+          filterable: true,
+          serverName: "house",
+          placeholder: "请选择楼幢",
+          value: "",
+          option: [],
+        },
+        {
+          title: "单元",
+          name: "Select",
+          multiple: true,
+          filterable: true,
+          serverName: "unit",
+          placeholder: "请选择单元",
+          value: "",
+          option: [{ label: 1, value: 1 }],
+        },
+        {
+          title: "楼层",
+          name: "Select",
+          multiple: true,
+          filterable: true,
+          serverName: "layer",
+          placeholder: "请选择楼层",
+          value: "",
+          option: [{ label: 1, value: 1 }],
+        },
+        {
+          title: "房号",
+          name: "Select",
+          multiple: true,
+          filterable: true,
+          serverName: "number_detail",
+          placeholder: "请选择房号",
+          value: "",
+          option: [{ label: 1, value: 1 }],
+        },
+        {
+          title: "产品",
+          name: "Select",
+          serverName: "product",
+          placeholder: "请选择产品",
+          value: "",
+          option: [],
+        },
+        {
+          title: "图号",
+          name: "Select",
+          serverName: "url_number",
+          placeholder: "请选择产品",
+          value: "",
+          option: [],
+        },
+        {
+          title: "部件",
+          name: "Select",
+          serverName: "part",
+          placeholder: "请选择部件",
+          value: "",
+          option: [],
+        },
+         {
+            title: "发货状态",
+            name: "Select",
+            serverName: "transportation_value",
+            value: "",
+            option: [
+              { label: "已确认", value: 1 },
+              { label: "未确认", value: 0 },
+            ],
+          },
+           {
+            title: "收货状态",
+            name: "Select",
+            serverName: "transportation_value",
+            value: "",
+            option: [
+              { label: "已收货", value: 1 },
+              { label: "未收货", value: 0 },
+            ],
+          }
+      ],
+      logList: [],
+      tableColums: [
+        { type: "selection", align: "center", width: "100", fixed: "left" },
+        {
+          title: "房间号",
+          align: "center",
+          minWidth: 100,
+          key: "number_detail",
+          render: (h, params) => {
+            const { row } = params;
+            return h(
+              "span",
+              `${row.house}-${row.unit}-${row.layer}-${row.number_detail}`
+            );
+          },
+        },
+        {
+          title: "产品名称",
+          align: "center",
+          minWidth: 200,
+          key: "product_title",
+        },
+        { title: "图号", align: "center", minWidth: 200, key: "url_number" },
+        { title: "部件", align: "center", minWidth: 200, key: "part_title" },
+        {
+          title: "零部件",
+          align: "center",
+          minWidth: 200,
+          key: "sub_part_title",
+        },
+        { title: "单位", align: "center", minWidth: 100, key: "company" },
+        {
+          title: "发货状态",
+          align: "center",
+          minWidth: 200,
+          key: "",
+          render: (h, params) =>
+            h(
+              "span",
+              {},
+              params.row.sub_state == 0
+                ? "未确认"
+                : '已确认'
+            ),
+        },
+         {
+          title: "收货状态",
+          align: "center",
+          minWidth: 200,
+          key: "",
+          render: (h, params) =>
+            h(
+              "span",
+              {},
+              params.row.sub_state == 0
+                ? "未收获"
+                : '已收货'
+            ),
+        },
+        { title: "芯片编号", align: "center", minWidth: 200, key: "tag" },
+        {
+          title: "操作",
+          align: "center",
+          width: "150",
+          fixed: "right",
+          slot: "set",
+        },
+      ],
+      tableData: [],
+      pageIndex: 1,
+      total: 0,
+      pageSize: 10,
+      loading: false,
+      selectedReturnArr: [],
+      selects: [],
+      selects_out: [],
+      showStock: false,
+      info: {
+        user_id: "",
+        work_type: 2,
+        order_in_no: "",
+        start_time: "",
+        end_time: "",
+        user_salary: "",
+      },
+      users: [],
+      time: "",
+      shipArray: [],
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  created() {
+    this.getOptions();
+  },
+
+  methods: {
+      outDelivery(row){
+         this.info.order_in_no = Array.isArray(row)
+        ? row.join(",")
+        : row.order_in_no;
+      this.showStock = true;
+      },
+    init(row) {
+      this.axios("/api/user").then((res) => (this.users = res.data.data));
+      this.pageIndex = 1;
+      row.page_index = this.pageIndex;
+      row.page_size = this.pageSize;
+      if (this.func.isType(row.house) == "Array") {
+        row.house = row.house.join(",");
+      }
+      if (this.func.isType(row.unit) == "Array") {
+        row.unit = row.unit.join(",");
+      }
+      if (this.func.isType(row.layer) == "Array") {
+        row.layer = row.layer.join(",");
+      }
+      if (this.func.isType(row.number_detail) == "Array") {
+        row.number_detail = row.number_detail.join(",");
+      }
+      if (this.func.isType(row.product) == "Array") {
+        row.product = row.product.join(",");
+      }
+      if (this.func.isType(row.part) == "Array") {
+        row.part = row.part.join(",");
+      }
+      Object.assign(row, this.$route.query);
+      this.proxyObj = row;
+      this.getData(row);
+    },
+    getOptions() {
+      this.axios("/api/orders_list_detail", {
+        params: {
+          order_no: this.$route.query.order_no,
+          type: this.$route.query.type,
+          transport_no:this.$route.query.transport_no
+        },
+      }).then((res) => {
+        res.data.house.map((v) => {
+          v.value = v.house;
+          v.label = v.house;
+        });
+        res.data.unit.map((v) => {
+          v.value = v.unit;
+          v.label = v.unit;
+        });
+        res.data.layer.map((v) => {
+          v.value = v.layer;
+          v.label = v.layer;
+        });
+        res.data.number_detail.map((v) => {
+          v.value = v.number;
+          v.label = v.number;
+        });
+        res.data.product_title.map((v) => {
+          (v.value = v.product_title), (v.label = v.product_title);
+        });
+        res.data.part_title.map((v) => {
+          (v.value = v.part_title), (v.label = v.part_title);
+        });
+        res.data.url_number.map((v) => {
+          (v.value = v.url_number), (v.label = v.url_number);
+        });
+        this.list[0].option = res.data.house;
+        this.list[1].option = res.data.unit;
+        this.list[2].option = res.data.layer;
+        this.list[3].option = res.data.number_detail;
+        this.list[4].option = res.data.product_title;
+        this.list[5].option = res.data.url_number;
+        this.list[6].option = res.data.part_title;
+      });
+    },
+    getData(row) {
+      this.loading = true;
+      this.axios("/api/orders_list_detail", { params: row }).then((res) => {
+        this.loading = false;
+        this.tableData = res.data.data;
+        this.logList = res.data.detail;
+        this.total = res.data.total || 0;
+      });
+    },
+    changePage(e) {
+      this.pageIndex = e;
+      this.proxyObj.page_index = e;
+      this.getData(this.proxyObj);
+    },
+    changeSize(e) {
+      this.pageSize = e;
+      this.proxyObj.page_size = this.pageSize;
+      this.getData(this.proxyObj);
+    },
+    back() {
+      this.$router.go(-1);
+    },
+    handleOrderReturn(row) {
+      let params = [];
+      if (!this.selectedReturnArr || this.selectedReturnArr.length < 1) {
+        return this.$Message.error("请至少选择一项");
+      }
+      params = this.selectedReturnArr.map((v) => {
+        return v.chip;
+      });
+      this.$Modal.confirm({
+        title: "确认退回？",
+        content: "此操作无法恢复，请确认！",
+        onOk: () => {
+          this.axios({
+            method: "post",
+            url: "/api/transport_callback",
+            data: {
+              tag: params,
+            },
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$Message.success(res.msg);
+              this.getData(this.proxyObj);
+            }
+          });
+        },
+        onCancel: () => {},
+      });
+    },
+    selectTable(row) {
+      this.selectedReturnArr = row;
+        this.selects = [];
+      row.forEach(v => {
+        this.selects.push(v.orders_procedure_id)
+      });
+      console.log(this.selects)
+    },
+    confirmSuccess(row) {
+      let params = "";
+      if (!row || row.length < 1) {
+        return this.$Message.error("请至少选择一项");
+      }
+      params = Array.isArray(row) ? row.join(",") : row.orders_procedure_id;
+      this.confirmDelete({
+        title: "包装完成",
+        content: "是否确认包装完成",
+        type: "primary",
+        then: () => {
+          this.axios
+            .post("/api/orders_in", { orders_procedure_id: params })
+            .then((res) => {
+              if (res.code == 200) {
+                this.$Message.success(res.msg);
+                this.getData(this.proxyObj);
+              }
+            });
+        },
+        cancel: () => {
+          this.$Message.warning("您取消了包装完成操作");
+        },
+      });
+    },
+    outStock(row) {
+      console.log("row :>> ", row);
+      if (!row || row.length < 1) {
+        return this.$Message.error("您未选择或者未确认包装完成");
+      }
+      this.info.order_in_no = Array.isArray(row)
+        ? row.join(",")
+        : row.order_in_no;
+      this.showStock = true;
+    },
+    confirmOutStock() {
+      if (this.time) {
+        this.info.start_time = new Date(this.time)
+          .toLocaleDateString()
+          .replace(/\//g, "-");
+        this.info.end_time = new Date(this.time)
+          .toLocaleDateString()
+          .replace(/\//g, "-");
+      }
+
+      this.axios.post("/api/orders_out", this.info).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success(res.msg);
+          this.getData(this.proxyObj);
+          // setTimeout(()=>this.back(),500)
+        }
+      });
+    },
+
+    outShip(row, type) {
+      //type 1出库  2运输
+      if (type == 3) {
+        this.confirmDelete({
+          title: "包装完成",
+          content: "是否确认包装完成",
+          type: "primary",
+          then: () => {
+            console.log(row)
+            this.axios
+              .post("/api/orders_in", { orders_procedure_id: row.orders_procedure_id })
+              .then((res) => {
+                if (res.code == 200) {
+                  this.$Message.success(res.msg);
+                  this.getData(this.proxyObj);
+                }
+              });
+          },
+          cancel: (e) => {},
+        });
+      } else {
+        if (!row || row.length < 1) {
+          return this.$Message.error("请至少选择一项");
+        }
+        let id = Array.isArray(row) ? row.join(",") : row.id;
+        let post_url =
+          type == 1 ? "/api/orders_transport" : '/api/orders_transport_confirm';
+        let params = {};
+        params.id = id;
+        this.confirmDelete({
+          title: type == 1 ? "发货完成" : "收获完成",
+          content: type == 1 ? "是否确认发货完成" : "是否确认收获完成",
+          type: "primary",
+          then: (e) => {
+            this.axios.post(post_url, params).then((res) => {
+              if (res.code == 200) {
+                this.$Message.success(res.msg);
+                this.getData(this.proxyObj);
+              }
+            });
+          },
+          cancel: (e) => {},
+        });
+      }
+    },
+    async exportData() {
+      const res = await this.axios("/api/orders_list_detail", {
+        params: { ...this.proxyObj, sub_type: "excel" },
+      });
+      if (res.code == 200) {
+        let url = `${this.$store.state.ip}/api/storage/${res.data.file}`;
+        location.href = url;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/ProductionOrderList/Deliverylist/Deliverylist.vue

@@ -417,7 +417,7 @@ export default {
       switch(row,type){
         case 1:
       this.$router.push({
-        path: "/cms/productionorderlist/inboundform/details",
+        path: "/cms/productionorderlist/deliverylist/deliverylistDetail",
         query: {
           order_no: row.order_no,
           type: 2,

src/views/ProductionOrderList/InboundForm/details.vue

@@ -97,18 +97,18 @@
           class="map-margin"
           v-if="row.in_out_value !== 1"
           @click="outShip(row, 3)"
-          >确认出库</a
+          >{{row.order_in_no?'':'包装完成'}}</a
         >
         <a
           class="map-margin"
-          @click="row.sub_state != 3 ? outShip(row, 2) : ''"
-          >{{ row.sub_state != 3 ? "发货指令" : "" }}</a
+          @click="row.order_in_no ? outDelivery(row) : ''"
+          >{{ row.in_out_value != 1 ? "发货指令" : "" }}</a
         >
       </template>
       <Modal
         class-name="vertical-center-modal"
         width="400"
-        title="确认出库"
+        title="发货指令"
         v-model="showStock"
         @on-ok="confirmOutStock"
       >
@@ -124,7 +124,7 @@
             </Select>
           </FormItem>
 
-          <FormItem label="出库日期">
+          <FormItem label="发货日期">
             <DatePicker
               :options="options"
               v-model="time"
@@ -415,6 +415,12 @@ export default {
   },
 
   methods: {
+      outDelivery(row){
+         this.info.order_in_no = Array.isArray(row)
+        ? row.join(",")
+        : row.order_in_no;
+      this.showStock = true;
+      },
     init(row) {
       this.axios("/api/user").then((res) => (this.users = res.data.data));
       this.pageIndex = 1;
@@ -558,8 +564,8 @@ export default {
       }
       params = Array.isArray(row) ? row.join(",") : row.orders_procedure_id;
       this.confirmDelete({
-        title: "确认入库",
-        content: "确认入库？",
+        title: "包装完成",
+        content: "是否确认包装完成",
         type: "primary",
         then: () => {
           this.axios
@@ -572,14 +578,14 @@ export default {
             });
         },
         cancel: () => {
-          this.$Message.warning("您取消了确认入库操作");
+          this.$Message.warning("您取消了包装完成操作");
         },
       });
     },
     outStock(row) {
       console.log("row :>> ", row);
       if (!row || row.length < 1) {
-        return this.$Message.error("您未选择或者未确认入库");
+        return this.$Message.error("您未选择或者未确认包装完成");
       }
       this.info.order_in_no = Array.isArray(row)
         ? row.join(",")
@@ -609,12 +615,13 @@ export default {
       //type 1出库  2运输
       if (type == 3) {
         this.confirmDelete({
-          title: "确认出库",
-          content: "确认出库么？",
+          title: "包装完成",
+          content: "是否确认包装完成",
           type: "primary",
-          then: (e) => {
+          then: () => {
+            console.log(row)
             this.axios
-              .post("/api/orders_transport", { transport_no: row.transport_no })
+              .post("/api/orders_in", { orders_procedure_id: row.orders_procedure_id })
               .then((res) => {
                 if (res.code == 200) {
                   this.$Message.success(res.msg);
@@ -630,12 +637,12 @@ export default {
         }
         let id = Array.isArray(row) ? row.join(",") : row.id;
         let post_url =
-          type == 1 ? "/api/orders_transport" : "/api/orders_transport_confirm";
+          type == 1 ? "/api/orders_transport" : '/api/orders_out';//"/api/orders_transport_confirm"
         let params = {};
         params.id = id;
         this.confirmDelete({
-          title: type == 1 ? "确认出库" : "确认运输",
-          content: type == 1 ? "确认出库么？" : "确认运输么",
+          title: type == 1 ? "包装完成" : "发货指令",
+          content: type == 1 ? "是否确认包装完成" : "确认发布发货指令",
           type: "primary",
           then: (e) => {
             this.axios.post(post_url, params).then((res) => {

src/views/ProductionOrderList/ProductionPlanlist/details.vue

@@ -5,7 +5,7 @@
       :list="list"
       @init="init"
       :logList="logList"
-      @searchData="init"
+      @searchData="search"
       @changePage="changePage"
       @changeSize="changeSize"
       @selectTable="selectTable"
@@ -141,6 +141,14 @@ export default {
           placeholder: "请选择图号",
           option: [],
         },
+         {
+          title: "派工状态",
+          name: "Select",       
+          serverName: "state",
+          placeholder: "请选择单元",
+          value: "",
+          option: [{ label: '未派工', value: 0 },{ label: '已派工', value: 1 }],
+        },
       ],
       tableColums: [
         { type: "selection", align: "center", fixed: "left", width: "100" },
@@ -274,6 +282,41 @@ export default {
     init(row) {
       this.pageIndex = 1;
       row.page_index = this.pageIndex;
+      row.state = 0;
+      this.list[8].value = 0;
+      row.page_size = this.pageSize;
+      this.order_no = this.$route.query.order_no;
+      Object.assign(row, this.$route.query);
+      if (this.func.isType(row.house) == "Array") {
+        row.house = row.house.join(",");
+      }
+      if (this.func.isType(row.unit) == "Array") {
+        row.unit = row.unit.join(",");
+      }
+      if (this.func.isType(row.layer) == "Array") {
+        row.layer = row.layer.join(",");
+      }
+      if (this.func.isType(row.number_detail) == "Array") {
+        row.number_detail = row.number_detail.join(",");
+      }
+      if (this.func.isType(row.part) == "Array") {
+        row.part = row.part.join(",");
+      }
+      if (this.func.isType(row.produce) == "Array") {
+        row.produce = row.produce.join(",");
+      }
+      if (this.func.isType(row.product) == "Array") {
+        row.product = row.product.join(",");
+      }
+      if (this.func.isType(row.img_number) == "Array") {
+        row.img_number = row.img_number.join(",");
+      }
+      this.proxyObj = row;
+      this.getData(row);
+    },
+     search(row) {
+      this.pageIndex = 1;
+      row.page_index = this.pageIndex;
       row.page_size = this.pageSize;
       this.order_no = this.$route.query.order_no;
       Object.assign(row, this.$route.query);

src/views/PurchasingManage/InstockOrder/list.vue

@@ -78,15 +78,14 @@
                     :value=3 />
           </Select>
         </FormItem>
-        <FormItem label="制单时间:">
+        <FormItem label="制单时间:" style="width:430px">
           <DatePicker type="date"
                       size="small"
                       style="width: 150px"
                       placeholder="年/月/日"
                       v-model="searchData.start_time"></DatePicker>
-        </FormItem>
-        <FormItem label="~">
-          <DatePicker type="date"
+                      ~
+                       <DatePicker type="date"
                       size="small"
                       style="width: 150px"
                       placeholder="年/月/日"

src/views/PurchasingManage/OutstockOrder/list.vue

@@ -78,20 +78,20 @@
                     :value=3 />
           </Select>
         </FormItem>
-        <FormItem label="制单时间:">
+        <FormItem label="制单时间:" style="width:430px">
           <DatePicker type="date"
                       size="small"
                       style="width: 150px"
                       placeholder="年/月/日"
                       v-model="searchData.start_time"></DatePicker>
-        </FormItem>
-        <FormItem label="~">
-          <DatePicker type="date"
+                      ~
+                       <DatePicker type="date"
                       size="small"
                       style="width: 150px"
                       placeholder="年/月/日"
                       v-model="searchData.end_time"></DatePicker>
         </FormItem>
+       
         <FormItem>
           <Button type="primary"
                   size="small"

src/views/Warehouse/FirstInventory/detail.vue

@@ -38,7 +38,6 @@
     </div>
     <div class="warehouseList_content">
       <Table :columns="tableColums"
-             max-height="570"
              :data="tableData"
              border>
         <template slot='set'
@@ -136,19 +135,19 @@ export default {
         end_time: null,
       },
       tableColums: [
-        { title: '物料分类', align: 'center', key: 'material_type_title', minWidth: 120 },
-        { title: '物料名称', align: 'center', key: 'material_title', minWidth: 100 },
+        { title: '物料分类', align: 'center', key: 'material_type_title', resizable:true,width: 200 },
+        { title: '物料名称', align: 'center', key: 'material_title',resizable:true,width: 200 },
         {
-          title: '规格型号', align: 'center', key: 'renovation_type', minWidth: 200,
+          title: '规格型号', align: 'center', key: 'renovation_type',resizable:true,width: 200,
           render: (h, params) => {
             const { row } = params
             let text = `L${row.long}*W${row.width}*H${row.high}`
             return h('span', {}, text)
           }
         },
-        { title: '计量单位', align: 'center', key: 'unit', minWidth: 120 },
+        { title: '计量单位', align: 'center', key: 'unit', resizable:true,width: 120 },
         {
-          title: '数量', align: 'center', key: 'num', minWidth: 100,
+          title: '数量', align: 'center', key: 'num', resizable:true,width: 200,
           render: (h, params) => {
             const { row, index } = params
             const currentRow = JSON.parse(JSON.stringify(this.tableData[index]))
@@ -168,7 +167,7 @@ export default {
           }
         },
         {
-          title: '单价', align: 'center', key: 'price', minWidth: 100,
+          title: '单价', align: 'center', key: 'price',resizable:true,width: 200,
           render: (h, params) => {
             const { row, index } = params
             const currentRow = JSON.parse(JSON.stringify(this.tableData[index]))
@@ -188,7 +187,7 @@ export default {
           }
         },
         {
-          title: '金额', align: 'center', key: 'total_price', minWidth: 100,
+          title: '金额', align: 'center', key: 'total_price', resizable:true,width: 200,
           render: (h, params) => {
             const { row, index } = params
             const currentRow = JSON.parse(JSON.stringify(this.tableData[index]))
@@ -207,7 +206,7 @@ export default {
             })
           }
         },
-        { title: '操作', align: 'center', key: 'set', slot: 'set', fixed: 'right', minWidth: 100 },
+        { title: '操作', align: 'center', key: 'set', slot: 'set', minWidth: 100 },
       ],
       tableData: [],
       page_index: 1,