Merge branch 'sit'

src/apis/service/sellOut/sellOutOrder/index.js

@@ -30,4 +30,6 @@ export default {
   afterstatus: (data, params) => http(api + "afterstatus", data, "post", params),
   // 确认收货
   saleoutreceipt: (data, params) => http(api + "saleoutreceipt", data, "post", params),
+  // 库管批量发货
+  saleoutbatch: (data, params) => http(api + "saleoutbatch", data, "post", params),
 };

src/assets/js/btnList.js

@@ -88,5 +88,6 @@ const btnList = [
   { code: "087", name: "导出" },
   { code: "088", name: "确认收货" },
   { code: "089", name: "批量已与供应商确认" },
+  { code: "090", name: "批量发货" },
 ];
 export default btnList;

src/components/globalComponents/logis-time-line/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

src/components/globalComponents/logis-time-line/main.vue

@@ -0,0 +1,93 @@
+<template>
+    <div class="logisTimeLine">
+    <el-steps
+      direction="vertical"
+      :active="options.length"
+      :space="80"
+      :finish-status="finishStatus"
+      :process-status="finishStatus"
+    >
+      <el-step
+        icon="el-icon-success"
+        v-for="(item, index) in options"
+        :key="item.time + index"
+        :finish-status="finishStatus"
+        :process-status="finishStatus"
+        style="margin: 0 0 0 150px; position: relative"
+      >
+        <div
+          slot="title"
+          style="
+            position: absolute;
+            width: 142px;
+            left: -150px;
+            text-align: right;
+          "
+        >
+          {{ item.status_name }}
+        </div>
+        <div slot="description">
+          <p class="name">
+           操作人： {{ item.action_name?item.action_name:'未知'}}
+          </p>
+          <!-- <p class="item">
+            {{ item.action_name?item.action_name:'未知'}}
+          </p> -->
+          <p class="time">
+            {{ item.addtime }}
+          </p>
+        </div>
+      </el-step>
+    </el-steps>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/process-time-line";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "logisTimeLine",
+  props: ["type", "orderCode", "newTime"],
+  mixins: [resToken],
+  data() {
+    return {
+      options: [],
+      loading: false,
+    };
+  },
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.getList();
+      }
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+
+  methods: {
+    async getList() {
+      if (!this.loading) {
+        this.loading = true;
+        this.options = [];
+        const res = await asyncRequest.list({
+          type: this.type,
+          orderCode: this.orderCode,
+        });
+        if (res && res.code === 0 && res.data) {
+          this.options = res.data;
+        } else {
+          this.options = [];
+        }
+        this.loading = false;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss">
+.date-picker.el-input {
+  // width: 150px !important;
+}
+</style>

src/views/sellOut/sellOutOrder/columns.js

@@ -323,4 +323,104 @@ const rshowColumns = [{
 },
 
 ]
-export { columns, showColumns, rshowColumns }
+const sendOutOrderColumns=[
+  {
+    type:'index',
+    label: "序号",
+    width: "70px"
+  },
+  {
+    prop: "value25",
+    label: "发货申请单号",
+    width: "156px"
+  },
+
+  {
+    prop: "value5",
+    label: "订单编号",
+    width: "156px"
+  },
+  {
+    prop: "value8",
+    label: "产品名称",
+    'min-width': "180px"
+  },
+  {
+    prop: "value9",
+    label: "规格",
+    'min-width': "180px"
+  },
+  {
+    prop: "value10",
+    label: "单位",
+    width: "45px"
+  },
+  {
+    prop: "value20",
+    label: "发货数量",
+    width: "100px",
+  },
+
+  {
+    prop: "value21",
+    label: "收货人",
+    width: "70px",
+  },
+  {
+    prop: "value22",
+    label: "联系方式",
+    width: "110px"
+  },
+  {
+    prop: "value23",
+    label: "收货地址",
+    width: "150px"
+  },
+  {
+    prop: "value26",
+    label: "发货申请单物流单号",
+    width: "150px"
+  },
+  {
+    prop: "value27",
+    label: "发货申请单物流费用",
+    width: "140px"
+  },
+  {
+    prop: "value28",
+    label: "发货申请单备注",
+    'min-width': "150px"
+  },
+]
+const head = [
+  "序号",
+  "创建时间",
+  "采购单编号",
+  "采购单状态",
+  "采购员",
+  "确认单号",
+  "确认单时间",
+  "产品编号",
+  "产品名称",
+  "规格",
+  "单位",
+  "供应商名称",
+  "供应商编号",
+  "裸价",
+  "物流费",
+  "发货方式",
+  "采购单价",
+  "确认单备注",
+  "采购数量",
+  "采购货款",
+  "发货数量",
+  "收货人",
+  "联系方式",
+  "收货地址",
+  "到货时间",
+  "发货申请单号",
+  "发货申请单物流单号",
+  "发货申请单物流费用",
+  "发货申请单备注",
+];
+export { columns, showColumns, rshowColumns,sendOutOrderColumns,head }

src/views/sellOut/sellOutOrder/detail.vue

@@ -285,6 +285,12 @@
             :orderCode="queryId"
           />
         </el-tab-pane>
+          <el-tab-pane label="物流进度" name="3">
+          <logis-time-line
+            v-if="newTime !== ''&&status"
+            :orderCode="sitem.post_code"
+          />
+        </el-tab-pane>
       </el-tabs>
       <div>
         <add-Edit-A

src/views/sellOut/sellOutOrder/index.vue

@@ -58,6 +58,25 @@
                   刷新
                 </el-button>
               </el-col>
+              <el-col
+                :span="4"
+                style="width: 66px; float: right"
+                v-if="
+                  powers &&
+                  powers.length > 0 &&
+                  powers.some((item) => item == '087')
+                "
+              >
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="download"
+                  :size="searchSize"
+                  class="fr"
+                >
+                  导出
+                </el-button>
+              </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
               <el-col :span="4" style="width: 150px">
@@ -66,7 +85,7 @@
                   v-model="parmValue.status"
                   filterable
                   clearable
-                  placeholder="发货申请单状态"
+                  placeholder="状态"
                   style="width: 100%"
                   @change="
                     pageInfo.curr = 1;
@@ -126,25 +145,26 @@
                   重置
                 </el-button>
               </el-col>
-              <!-- 暂时注释，下版需要导出 -->
+
               <el-col
                 :span="4"
                 style="width: 66px; float: right"
                 v-if="
-                  powers && powers.length > 0 && powers.some((item) => item == '087')
+                  powers &&
+                  powers.length > 0 &&
+                  powers.some((item) => item == '090')
                 "
               >
                 <el-button
                   type="primary"
                   style="margin-left: 30px"
-                  @click="download"
+                  @click="routeGoto('sendOutOrder', {})"
                   :size="searchSize"
                   class="fr"
                 >
-                  导出
+                  批量发货
                 </el-button>
               </el-col>
-              
             </el-row>
           </div>
         </template>
@@ -179,8 +199,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              
-               @click="getRouter('sellOutOrderDetail', scope.row.outCode )"
+              @click="getRouter('sellOutOrderDetail', scope.row.outCode)"
             ></i>
           </el-tooltip>
         </template>
@@ -265,7 +284,7 @@ export default {
         order_type: "",
         orderCode: "",
         apply_name: "", //申请人名称
-        cgdNo:"",
+        cgdNo: "",
         start: "",
         end: "",
         // supplierNo: "",
@@ -299,33 +318,32 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue)
-      const {page,size}=this.parmValue;
+      console.log(this.parmValue);
+      const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
-      if(this.parmValue.companyNo.length>0){
-          this.customerCode = [this.parmValue.companyNo] ;
+      if (this.parmValue.companyNo.length > 0) {
+        this.customerCode = [this.parmValue.companyNo];
       }
-      
-       this.pageInfo= {
+
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    this.select = this.parmValue.select;
-    // this.sselect = this.parmValue.sselect;
-    this.s_input = this.parmValue.s_input
-
-    }else{
-       this.select = "orderCode";
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.s_input = this.parmValue.s_input;
+    } else {
+      this.select = "orderCode";
       //  this.sselect = "创建时间"
     }
     this.searchList();
   },
 
   methods: {
-    getRouter(toRouter, queryId){
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
@@ -333,16 +351,16 @@ export default {
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select ;
+        this.parmValue.select = this.select;
         // this.parmValue.sselect = this.sselect ;
-        this.parmValue.s_input= this.s_input;
+        this.parmValue.s_input = this.s_input;
         //
-         let routerModel = {
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -429,7 +447,7 @@ export default {
         order_type: "1",
         orderCode: "",
         apply_name: "", //申请人名称
-        cgdNo:"",
+        cgdNo: "",
         start: "",
         end: "",
         // supplierNo: "",
@@ -573,7 +591,7 @@ export default {
         this.parmValue.companyNo = e.code;
       } else {
         this.customerCode = [];
-        this.parmValue.supplierName = '';
+        this.parmValue.supplierName = "";
         this.parmValue.companyNo = "";
       }
       this.pageInfo.curr = 1;
@@ -592,8 +610,7 @@ export default {
         this.select === "good_name" ? this.s_input : "";
       this.parmValue.apply_name =
         this.select === "apply_name" ? this.s_input : "";
-        this.parmValue.cgdNo =
-        this.select === "cgdNo" ? this.s_input : "";
+      this.parmValue.cgdNo = this.select === "cgdNo" ? this.s_input : "";
       await this.searchList();
     },
   },

src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -0,0 +1,245 @@
+<template>
+  <div class="orderImport pagePadding" v-loading="loading">
+    <div
+      v-if="tableData && tableData.length > 0"
+      class="tr"
+      style="padding: 10px 0 0 0"
+    >
+      <el-button @click="cancel" :size="'mini'">取消</el-button>
+      <el-button type="primary" @click="submit" :size="'mini'">提交</el-button>
+    </div>
+    <div v-else>
+      <upload-excel :on-success="handleSuccess" :before-upload="beforeUpload" />
+    </div>
+    <ex-table
+      :columns="columns"
+      :table="table"
+      :data="tableData"
+      style="margin: 15px 0 0 0"
+    >
+    </ex-table>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
+import resToken from "@/mixins/resToken";
+import { sendOutOrderColumns, head } from "./columns";
+
+export default {
+  mixins: [resToken],
+  name: "orderImport",
+  data() {
+    return {
+      ruleForm: {
+        order_addr: [], //收货地址
+      },
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        "max-height": "800px",
+        // _defaultHeader_: ["setcol"],
+      },
+      tableData: [],
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      head,
+      loading: false,
+      // 表格 - 列参数
+      columns: sendOutOrderColumns,
+
+      //按钮锁
+      btnFlag: false,
+
+      //编辑全局锁
+      editBtnFlag: false,
+    };
+  },
+  mounted() {},
+  methods: {
+    beforeUpload(file) {
+      const isLt1M = file.size / 1024 / 1024 < 1;
+      if (isLt1M) {
+        return true;
+      }
+      this.$message({
+        message: "请不要上传大于1MB的文件.",
+        type: "warning",
+      });
+      return false;
+    },
+    handleSuccess({ results, header }) {
+      if (!this.loading) {
+        this.loading = true;
+        if (results.length === 0) {
+          this.$message.error("表格无有效数据！");
+          this.loading = false;
+          return;
+        }
+
+        if (this.head.length !== header.length) {
+          this.$message.error("表头与导入模板不匹配！");
+          this.loading = false;
+          return;
+        }
+        let hederOk = true;
+        this.head.forEach((v1, i1) => {
+          if (v1 !== header[i1].replace(/\s*/g, "")) {
+            console.log(v1 + "----" + header[i1]);
+            hederOk = false;
+          }
+        });
+
+        if (!hederOk) {
+          this.$message.error("表头与导入模板不匹配！");
+          this.loading = false;
+          return;
+        }
+        this.tableData = [];
+        let list = results;
+
+        try {
+          list.forEach((obj, index) => {
+            let model = {};
+            let arr = Object.values(obj);
+            arr.forEach((key, ii) => {
+              Object.defineProperty(model, `value${ii}`, {
+                value: key !== null && key !== undefined ? key + "" : "",
+              });
+            });
+            this.tableData.push(model);
+          });
+        } catch (e) {
+          console.log(e);
+        }
+        this.loading = false;
+      }
+    },
+    //取消
+    cancel() {
+      this.tableData = [];
+    },
+
+    //提交
+    async submit() {
+      if (!this.loading) {
+        this.loading = true;
+        if (this.tableData.length === 0) {
+          this.$message.warning("导入数据不能为空");
+          this.loading = false;
+          return;
+        }
+
+        let isok = true,
+          list = [];
+
+        this.tableData.forEach((key, index) => {
+          if (
+            key["value25"] === "" ||
+            key["value26"] === "" ||
+            key["value27"] === "" ||
+            key["value28"] === ""
+          ) {
+            isok = false;
+          }
+          let ketitem = {
+            outCode: key["value25"],
+            post_code: key["value26"],
+            post_fee: key["value27"],
+            remark: key["value28"],
+          };
+
+          console.log(ketitem);
+          list.push(ketitem);
+        });
+        if (!isok) {
+          this.$notify.warning({
+            title: "以下单号不能为空!",
+            message:
+              "发货申请单号/发货申请单物流单号/发货申请单物流费用/发货申请单备注",
+          });
+          this.loading = false;
+          return;
+        }
+        let model = {
+          list: JSON.parse(JSON.stringify(list)),
+        };
+        console.log(model);
+        this.loading = false;
+
+        const { code, data, message } = await asyncRequest.saleoutbatch(model);
+        this.loading = false;
+        if (code === 0) {
+          this.$notify.success({
+            title: "导入成功！",
+            message: "",
+          });
+          this.tableData = [];
+          await this.routeReGoto("sellOutOrder", {});
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else if (code == 1005) {
+          let resList = JSON.parse(JSON.stringify(data));
+
+          let htmlList = "<ul>";
+          resList.forEach((v) => {
+            htmlList += `<li>${v.outCode}</li>`;
+          });
+          htmlList += "</ul>";
+          this.$notify({
+            title: message,
+            dangerouslyUseHTMLString: true,
+            message: htmlList,
+          });
+        } else {
+          this.$message.warning(message);
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.box {
+  width: 100%;
+  // padding-top: 50px;
+  box-sizing: border-box;
+  // height: 100vh;
+  // overflow: hidden;
+  background: #fff;
+}
+.con {
+  width: 100%;
+  margin: 0px auto;
+  background: #fff;
+  // padding: 50px;
+  box-sizing: border-box;
+
+  h1 {
+    margin-bottom: 20px;
+    margin-top: 20px;
+    font-size: 16px;
+    color: #333;
+  }
+}
+// .tab{
+//   width: 100%;
+//   overflow: hidden;
+//   margin: auto;
+//   box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1);
+//   padding: 30px;
+
+// }
+.btn {
+  width: 50%;
+  margin: 50px auto 0;
+  display: flex;
+  justify-content: space-around;
+}
+</style>

src/views/sellOut/zxDiffOrder/columns.js

@@ -18,7 +18,7 @@ const columns = [
   },
   {
     prop: "gold_price",
-    label: "订单总金额",
+    label: "金价",
     width: "125px",
   },
   {
@@ -104,7 +104,7 @@ const showColumns = [
   },
   {
     prop: "gold_price",
-    label: "订单总金额",
+    label: "金价",
     span: 6
   },
   {