暂存

src/styles/index.scss

@@ -511,9 +511,9 @@ aside {
     #demo-ruleForm.el-form {
       .el-row {
         border-left: 1px solid #ebeef5 !important;
-        border-bottom: 1px solid #ebeef5 !important;
+        border-top : 1px solid #ebeef5 !important;
         .el-col {
-          border-top: 1px solid #ebeef5 !important;
+          border-bottom: 1px solid #ebeef5 !important;
           border-right: 1px solid #ebeef5 !important;
           .el-form-item {
             margin: 0 !important;
@@ -573,4 +573,14 @@ aside {
    }
    
   }
+}
+.detail-page-title{
+  line-height: 50px!important;
+  font-size: 16px!important;
+  padding:0 0 0 10px!important;
+  span.title{
+    line-height: 50px!important;
+  font-size: 16px!important;
+  margin: 0 20px 0 0;
+  }
 }

src/views/purchaseIn/purchaseOrder/columns.js

@@ -73,13 +73,13 @@ export default [
   {
     prop: "wsend_num",
     label: "未发货数量",
-    width: "110px",
+    width: "105px",
   },
   {
     prop: "status",
     label: "状态",
     _slot_: "status",
-    width: "80px",
+    width: "110px",
   },
   {
     prop: "lasttime",

src/views/purchaseIn/purchaseOrder/components/purchase-order-addEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="tr" style="padding: 10px 0">
+    <div class="tr" >
       <el-button
         type="primary"
         :size="'mini'"

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-check-form.vue

@@ -109,7 +109,7 @@
                   disabled
                   v-model="ruleForm.remark"
                   maxlength="250"
-                  :autosize="{ minRows: 3, maxRows: 3 }"
+                  :autosize="{ minRows: 2, maxRows: 2 }"
                 />
               </el-form-item>
             </el-col>
@@ -137,7 +137,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchaseOrderDetail"
+          (item) => item.menu_route == "stockInDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -254,7 +254,7 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { wsm_in_code, status, send_num } = this.sitem;
+          const { wsm_in_code, status, send_num,remark } = this.sitem;
           const {
             return_contactor,
             return_addr,
@@ -263,7 +263,6 @@ export default {
             reissue_num,
             return_num,
             error_remark,
-            remark,
           } = this.sitem.return;
 
           this.status = status;

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-record-form.vue

@@ -145,7 +145,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchaseOrderDetail"
+          (item) => item.menu_route == "stockInDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-return-form.vue

@@ -27,7 +27,7 @@
                 <el-input
                   placeholder="物流公司"
                   :disabled="
-                    !(status === '6' && powers.some((item) => item == '031'))
+                    !(status === '5' && powers.some((item) => item == '032'))
                   "
                   v-model="ruleForm.post_company"
                   maxlength="100"
@@ -40,7 +40,7 @@
                 <el-input
                   placeholder="物流单号"
                   :disabled="
-                    !(status === '6' && powers.some((item) => item == '031'))
+                    !(status === '5' && powers.some((item) => item == '032'))
                   "
                   v-model="ruleForm.post_code"
                   maxlength="100"
@@ -51,7 +51,7 @@
             <el-col :span="24" style="text-align: right">
               <el-button
                 type="primary"
-                v-if="status === '6' && powers.some((item) => item == '031')"
+                v-if="status === '5' && powers.some((item) => item == '032')"
                 :size="'mini'"
                 @click="submitForm"
                 >保 存
@@ -67,17 +67,15 @@
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate";
-import wsmInOrderErrorModel from "./wsm-in-order-error-model";
 export default {
   name: "wsmInOrderAdd",
   props: ["id", "sitem", "newTime", "modelSitem"],
-  components: { wsmInOrderErrorModel },
   mixins: [resToken],
   computed: {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchaseOrderDetail"
+          (item) => item.menu_route == "stockInDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -4,13 +4,21 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      {{ status }}----{{ powers }}
-
-      <!-- @change="handleChange" -->
+      <div class="detail-page-title">
+        <span class="title">采购单编号：{{ queryId }}</span>
+        <span class="fr">
+          <el-tag>
+            {{
+              (statusList.find((item) => item.code == status) || {}).label ||
+              "--"
+            }}
+          </el-tag>
+        </span>
+      </div>
       <el-collapse v-model="activeNames">
         <el-collapse-item title="采购单信息" name="1">
           <purchase-order-addEdit
-          style="padding:0 0 20px 0;"
+            style="padding: 0 0 20px 0"
             :newTime="newTime"
             v-if="newTime !== ''"
             :sitem="sitem"
@@ -38,7 +46,7 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
-import purchaseOrderAddEdit  from "./components/purchase-order-addEdit";
+import purchaseOrderAddEdit from "./components/purchase-order-addEdit";
 import purchaseOrderInTable from "./components/purchase-order-in-table";
 
 export default {
@@ -69,7 +77,24 @@ export default {
       finishStatus: "finish",
       activeNames: ["0", "1", "2", "3", "4", "5"],
       sitem: null,
-
+      statusList: [
+        {
+          code: "0",
+          label: "待同意发货",
+        },
+        {
+          code: "1",
+          label: "待发货",
+        },
+        {
+          code: "2",
+          label: "部分发货",
+        },
+        {
+          code: "3",
+          label: "发货完成",
+        },
+      ],
       status: "",
       newTime: "",
       loading: false,
@@ -81,7 +106,6 @@ export default {
     this.initData();
   },
   methods: {
- 
     getNewTime() {
       this.newTime = new Date().valueOf();
     },

src/views/purchaseIn/purchaseOrder/index.vue

@@ -41,9 +41,9 @@
                   "
                 >
                   <el-option
-                    v-for="item in statusList"
+                    v-for="item in statusOptions"
                     :key="'status' + item.code"
-                    :label="item.name"
+                    :label="item.label"
                     :value="item.code"
                   />
                 </el-select>
@@ -51,7 +51,7 @@
               <el-col :span="4" style="width: 370px; padding: 0 0 0 10px">
                 <search-supplier
                   :size="searchSize"
-                  :value="parmValue.supplierNo"
+                  :value="wsm_supplierNo"
                   :placeholder="'入库公司名称'"
                   :disabled="false"
                   :isDetail="false"
@@ -61,12 +61,12 @@
               <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
                 <search-stock
                   :size="searchSize"
-                  :value="parmValue.stockNo"
+                  :value="stockNo"
                   :placeholder="'入库仓库名称'"
                   :disabled="false"
                   :isDetail="false"
                   :isRelation="true"
-                  :companyCode="supplierNo"
+                  :companyCode="parmValue.wsm_supplierNo"
                   @searchChange="stockChange"
                 />
               </el-col>
@@ -154,8 +154,10 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
+              (
+                statusOptions.find((item) => item.code == scope.row.status) ||
+                {}
+              ).label || '--'
             "
           ></el-tag>
         </template>
@@ -166,18 +168,40 @@
             border
             style="width: 100%"
           >
-            <el-table-column
-              prop="wsm_in_code"
-              label="备货入库单编号"
-              width="180"
-            >
+            <el-table-column prop="wsm_in_code" label="备货入库单编号">
             </el-table-column>
-            <el-table-column prop="wsm_reaper" label="仓库接收人" width="180">
+            <el-table-column prop="wsm_reaper" label="仓库接收人">
             </el-table-column>
-            <el-table-column prop="send_num" label="发货数量" width="110">
+            <el-table-column prop="send_num" label="发货数量">
+            </el-table-column>
+            <el-table-column prop="post_company" label="发货快递公司">
+            </el-table-column>
+            <el-table-column prop="post_code" label="快递编号">
+            </el-table-column>
+            <el-table-column prop="post_fee" label="邮费"> </el-table-column>
+            <el-table-column prop="error_num" label="异常数量">
+            </el-table-column>
+            <el-table-column prop="check_name" label="验货人">
             </el-table-column>
             <el-table-column prop="sendtime" label="发货时间" width="145">
             </el-table-column>
+            <el-table-column>
+              <template slot-scope="scope">
+                <el-tooltip
+                  v-if="powers.some((item) => item == '007')"
+                  effect="dark"
+                  content="详情"
+                  placement="top"
+                >
+                  <i
+                    class="el-icon-view tb-icon"
+                    @click="
+                      routeGoto('stockInDetail', { id: scope.row.wsm_in_code })
+                    "
+                  ></i>
+                </el-tooltip>
+              </template>
+            </el-table-column>
           </el-table>
         </template>
         <template #operation="{ scope }">
@@ -203,7 +227,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import columns from "./columns"; //表格列参数
 import { mapGetters } from "vuex";
@@ -239,14 +263,30 @@ export default {
       sselect: "创建时间",
       // 状态
       statusOptions: [
-        { id: "0", label: "禁用" },
-        { id: "1", label: "启用" },
+        {
+          code: "0",
+          label: "待同意发货",
+        },
+        {
+          code: "1",
+          label: "待发货",
+        },
+        {
+          code: "2",
+          label: "部分发货",
+        },
+        {
+          code: "3",
+          label: "发货完成",
+        },
       ],
-      statusList: statusList,
+
       loading: false,
       showModel: false,
       isDetail: false,
       modelId: 0,
+      stockNo: [],
+      wsm_supplierNo: [],
       parmValue: {
         bk_code: "", // 备库编码
         wsm_in_code: "", // 入库单号
@@ -298,6 +338,8 @@ export default {
       this.sselect = "创建时间";
       this.select = "1";
       this.input = "";
+      this.wsm_code = [];
+      this.wsm_supplierNo = [];
       this.timeOBJ = {
         start: "", //起始时间
         end: "", // 结束时间
@@ -309,9 +351,7 @@ export default {
         apply_name: "", // 申请人
         good_name: "", // 产品名称
         good_code: "", // 产品属性编号
-
         status: "", //状态
-
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
         end: "", // 新建结束时间
@@ -347,22 +387,25 @@ export default {
     },
     async supplierChange(e) {
       if (e && e.id) {
-        this.parmValue.supplierNo = [e.code];
-        this.supplierNo = e.code;
+        this.parmValue.wsm_supplierNo = e.code;
+        this.wsm_supplierNo = [e.code];
       } else {
-        this.parmValue.supplierNo = [];
-        this.supplierNo = "";
+        this.parmValue.wsm_supplierNo = "";
+        this.wsm_supplierNo = [];
       }
-      this.parmValue.stockNo = [];
+      this.parmValue.stockNo = "";
+      this.stockNo = [];
       this.parmValue.page = 1;
       this.pageInfo.curr = 1;
       await this.searchList();
     },
     async stockChange(e) {
       if (e && e.id) {
-        this.parmValue.stockNo = [e.code];
+        this.parmValue.stockNo = e.code;
+        this.stockNo = [e.code];
       } else {
-        this.parmValue.stockNo = [];
+        this.parmValue.stockNo = "";
+        this.stockNo = [];
       }
 
       console.log(e);
@@ -379,7 +422,7 @@ export default {
       this.parmValue.good_name = this.select === "5" ? this.input : ""; // 产品名称
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
-
+      // this.wsm_supplierNo = [];
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/purchaseIn/purchaseOrder/stockInDetail.vue

@@ -4,7 +4,17 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <div>{{ status }}------{{ powers }}</div>
+      <div class="detail-page-title">
+        <span class="title">备货入库单编号：{{ queryId }}</span>
+        <span class="fr">
+          <el-tag>
+            {{
+              (statusList.find((item) => item.code == status) || {}).label ||
+              "--"
+            }}
+          </el-tag>
+        </span>
+      </div>
       <el-collapse v-model="activeNames">
         <el-collapse-item title="入库单发货信息" name="0">
           <wsm-in-order-addEdit-form
@@ -44,7 +54,10 @@
             @refresh="initData()"
           />
         </el-collapse-item>
-        <el-collapse-item title="入库审核" name="4">
+        <el-collapse-item
+          title="入库审核"
+          v-if="status == '3' && powers.some((item) => item == '031')"
+        >
           <exam-form
             :statusList="statusList"
             :newTime="newTime"
@@ -54,7 +67,11 @@
             @searchChange="examForm"
           />
         </el-collapse-item>
-        <el-collapse-item title="入库退货" name="5">
+        <el-collapse-item
+          title="入库退货"
+          v-if="status == '5' && powers.some((item) => item == '032')"
+          name="5"
+        >
           <wsm-in-order-return-form
             v-if="newTime !== ''"
             :id="queryId"
@@ -109,7 +126,32 @@ export default {
       activeNames: ["0", "1", "2", "3", "4", "5"],
       sitem: null,
       status: "",
-      statusList: [],
+      statusList: [
+        {
+          code: "0",
+          label: "待发货",
+        },
+        {
+          code: "1",
+          label: "待验货",
+        },
+        {
+          code: "2",
+          label: "待审核",
+        },
+        {
+          code: "3",
+          label: "待入库",
+        },
+        {
+          code: "4",
+          label: "无退货入库成功",
+        },
+        {
+          code: "5",
+          label: "退货成功",
+        },
+      ],
       newTime: "",
       loading: false,
       queryId: "",

src/views/sellOut/consultOrder/columnsForm.js

@@ -112,7 +112,7 @@ export default [
     {
         prop: "desc",
         label: "工艺说明",
-        col: "8",
+        col: "16",
     },
     {
         prop: "metals",

src/views/sellOut/consultOrder/index.vue

@@ -262,6 +262,11 @@ export default {
           label: "咨询单号",
           fixed: "left",
           width: "152px",
+        },
+         {
+          prop: "sequenceNo",
+          label: "单据号",
+          width: "152px",
         },
         {
           prop: "salesman",

src/views/stock/allot/components/addForm.vue

@@ -75,7 +75,12 @@
       </el-form>
     </el-col>
     <el-col :span="24">
-      <el-row v-if="status == '' || status === '0' && powers.some((item) => item == '005')">
+      <el-row
+        v-if="
+          status == '' ||
+          (status === '0' && powers.some((item) => item == '005'))
+        "
+      >
         <el-col :span="24" style="padding: 0 0 10px 0">
           <span>调拨商品：</span>
           <el-button
@@ -449,7 +454,7 @@ export default {
                 v1.type = "select";
               }
             }
-            if (this.status == "0") {
+            if (this.status == "0" || this.status == "") {
               if (v1.prop === "allot_num") {
                 v1.width = "150px";
                 v1.type = "input";