build

src/views/sellOut/sellReturn/components/ShowDataTableColumns.js

@@ -96,4 +96,22 @@ const showColumns = [
   }
 ]
 
+export const setWorkOrderColumns = [
+  {
+    prop: 'orderCode',
+    label: '销售单编号',
+    span: 7
+  },
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    span: 7
+  },
+  {
+    prop: 'return_num',
+    label: '退货数量',
+    span: 4
+  }
+]
+
 export { showColumns }

src/views/sellOut/sellReturn/components/child-list.vue

@@ -173,8 +173,9 @@ export default {
       const { code, data } = await asyncRequest.reorderRool({returnCode: this.sitem.returnCode});
       console.log(this.sitem)
       if (code === 0) {
-        const { list } = data;
+        const { list ,count} = data;
         this.tableData = list;
+        this.pageInfo.total = count 
         /* 从发货信息中拿到第一条数据 **/
         this.$emit('getSendInfoFirst', list[0])
       } else if (code >= 100 && code <= 104) {

src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -2,27 +2,31 @@
   <div class="work-order__wrapper">
     <template v-if="isSalesWarehouselist">
       <el-form ref="formRef" :model="list">
-        <el-table size="mini" border :data="list">
-          <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-          <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
-          <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
-          <el-table-column prop="num" width="100px" label="发货数量" show-overflow-tooltip />
-          <el-table-column label="发货仓库名称" prop="wsm_name" width="180px" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <el-popover placement="top" width="380" trigger="hover">
-                <h2>发货仓库</h2>
-                <ul>
-                  <li>编码 : {{ scope.row.wsm_code }}</li>
-                  <li>负责人 : {{ scope.row.contactor_name }}</li>
-                  <li>所在供应商名称 : {{ scope.row.supplierName }}</li>
-                  <li>所在供应商编码 : {{ scope.row.supplierNo }}</li>
-                </ul>
-                <i slot="reference" class="el-icon-warning-outline" />
-              </el-popover>
-              <span>{{ scope.row.wsm_name }}</span>
-            </template>
-          </el-table-column>
-          <el-form>
+        <div>
+          <show-data-table
+            style="margin: 0px; padding: 0"
+            :sitem="{...sitem,...outItem}"
+            :columns="setWorkOrderColumns"
+          />
+
+          <el-table size="mini" border :data="list">
+            <el-table-column prop="outChildCode" label="发货工单编号" width="160px" show-overflow-tooltip />
+            <el-table-column label="发货仓库名称" prop="wsm_name" width="180px" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-popover placement="top" width="380" trigger="hover">
+                  <h2>发货仓库</h2>
+                  <ul>
+                    <li>编码 : {{ scope.row.wsm_code }}</li>
+                    <li>负责人 : {{ scope.row.contactor_name }}</li>
+                    <li>所在供应商名称 : {{ scope.row.supplierName }}</li>
+                    <li>所在供应商编码 : {{ scope.row.supplierNo }}</li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline" />
+                </el-popover>
+                <span>{{ scope.row.wsm_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="num" width="80px" label="发货数量" show-overflow-tooltip />
             <el-table-column width="110px" show-overflow-tooltip>
               <template slot="header">
                 <span style="color:red;margin-right:2px">*</span>退货数量
@@ -65,13 +69,14 @@
                 </el-form-item>
               </template>
             </el-table-column>
-          </el-form>
-          <el-table-column label="退货仓库" align="center">
-            <el-table-column label="所在供应商名称" prop="returnSupplierName" min-width="160px" show-overflow-tooltip />
-            <el-table-column label="所在供应商编码" prop="returnSupplierNo" min-width="160px" show-overflow-tooltip />
-            <el-table-column label="负责人" width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip />
-          </el-table-column>
-        </el-table>
+
+            <el-table-column label="退货仓库" align="center">
+              <el-table-column label="所在供应商名称" prop="returnSupplierName" min-width="160px" show-overflow-tooltip />
+              <el-table-column label="所在供应商编码" prop="returnSupplierNo" min-width="160px" show-overflow-tooltip />
+              <el-table-column label="负责人" width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip />
+            </el-table-column>
+          </el-table>
+        </div>
       </el-form>
     </template>
 
@@ -101,15 +106,18 @@
 import asyncRequest from '@/apis/service/sellOut/sellAfterApply'
 import companyHelper from '@/mixins/companyHelper'
 import resToken from '@/mixins/resToken'
+import { setWorkOrderColumns } from './ShowDataTableColumns'
+
 export default {
   name: 'WorkOrder',
   mixins: [resToken, companyHelper],
   props: ['sitem', 'outItem'],
   data: () => ({
     list: [],
+    companyNo: '',
     loading: false,
     subLoading: false,
-    companyNo: '',
+    setWorkOrderColumns,
     formData: {
       return_wsm_code: '',
       return_num: '0'
@@ -157,6 +165,7 @@ export default {
     },
     async onRequestSendList() {
       const { data, code, message } = await asyncRequest.sendList({ outCode: this.outItem.outCode })
+
       switch (code) {
         case 0:
           this.list = data.map(item => ({
@@ -222,6 +231,7 @@ export default {
         this.subLoading = false
         switch (code) {
           case 0:
+            this.$message.warning('工单设置成功!')
             this.$emit('reload')
             break
           default:

src/views/sellOut/sellReturn/detail.vue

@@ -180,7 +180,7 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="待设置工单" name="7" v-if="isHasPermission({status:'11',process:'11'})">
+            <el-collapse-item title="待设置工单" name="7"  v-if="isHasPermission({status:'11',process:'11'})" >
               <set-work-order :sitem="sitem" :outItem="outItem" @reload="handleReload" />
             </el-collapse-item>
 

src/views/supplierPurchaseIn/supplierPurchaseOrder/components/order-in-table.vue

@@ -43,7 +43,7 @@
                   class="el-icon-circle-plus-outline tb-icon"
                   style="color: #6954f0"
                   @click="openModal()"
-                ></i>
+                />
               </el-tooltip>
               <span v-else>操作</span>
             </template>
@@ -114,26 +114,8 @@ export default {
       },
       tableFormThis: config.tableFormThis,
       statusOptions: [
-        {
-          value: "1",
-          label: "待库管验货",
-        },
-        {
-          value: "2",
-          label: "待仓库主管审核",
-        },
-        {
-          value: "4",
-          label: "入库完成",
-        },
-        {
-          value: "5",
-          label: "待填写物流",
-        },
-        {
-          value: "6",
-          label: "退货完成",
-        },
+         { value: "1",label: "待库管验货",},
+         { value: "2",label: "入库完成",}
       ],
       columns: config.columns,
     };

src/views/supplierPurchaseIn/supplierPurchaseOrder/detail.vue

@@ -116,10 +116,10 @@
                 </template>
 
                 <template slot="wsm">
-                  <span>{{ sitem.wsm_supplier }}/{{ sitem.wsm_name }}</span>
+                  <span><template v-if="sitem.wsm_supplier">{{ sitem.wsm_supplier }}/</template>{{ sitem.wsm_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
-                      <li>
+                      <li v-if="sitem.wsm_supplierNo">
                         <span>仓库公司编号：</span><span>{{ sitem.wsm_supplierNo }}</span>
                       </li>
                       <li>

src/views/supplierPurchaseIn/supplierWsmInOrder/index.vue

@@ -303,14 +303,8 @@ export default {
 
       // 状态
       statusOptions: [
-         {
-           value: "1",
-           label: "待库管验货",
-         },
-         {
-           value: "2",
-           label: "入库完成",
-         },
+         { value: "1",label: "待库管验货",},
+         { value: "2",label: "入库完成",}
       ],
       loading: false,
       showModel: false,

src/views/supplierWorkbench/workbench/components/baseForm.vue

@@ -800,7 +800,6 @@ export default {
           delivery_fee
         ).toFixed(2);
       }
-      console.log(new Date().valueOf() + this.newPrice);
     },
 
     number_change(e, key) {
@@ -979,7 +978,6 @@ export default {
             } else {
               res = await asyncRequest.good_update(model);
             }
-            console.log(res);
             this.loading = false;
             if (res && res.code === 0) {
               const title = this.type === "add" ? "新建成功！" : "修改成功!";
@@ -1007,6 +1005,8 @@ export default {
       // 重置
       await this.$nextTick(async () => {
         if (this.$refs.ruleForm) {
+          console.log(this.queryId)
+
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.spec_tableData = [];