Merge branch 'company' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into company

src/components/globalComponents/company-sort/index.vue

@@ -121,7 +121,8 @@ export default {
           cat_name: query,
           pid: '',
           status: '',
-          companyNo: this.companyNo
+          companyNo: this.companyNo,
+          noRelation: !!this.companyNo
         }
 
         const res = await asyncRequest.list(formValue)

src/views/purchaseIn/deliveryWorkOrder/components/ShowDataTableColumns.js

@@ -76,6 +76,21 @@ const showColumns = [
     label: '物流费用',
     span: 12
   },
+  {
+    prop: 'contactor',
+    label: '收货人',
+    span: 8
+  },
+  {
+    prop: 'mobile',
+    label: '收货电话',
+    span: 8
+  },
+  {
+    prop: 'addr',
+    label: '收货地址',
+    span: 8
+  },
   {
     prop: 'remark',
     label: '备注',

src/views/reportQuery/purchaseReport/components/table6.vue

@@ -24,7 +24,7 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
-            <el-col :span="6" style="width: 430px">
+            <el-col :span="6" style="width: 380px">
               <div class="fl" style="line-height: 28px; padding: 0 12px 0 0">
                 创建时间:
               </div>
@@ -51,6 +51,26 @@
                 "
               />
             </el-col>
+            <el-col :span="4" style="margin-left:10px">
+              <el-select
+                v-model="parmValue.status"
+                size="mini"
+                placeholder="状态"
+                clearable
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="opt in statusOptions"
+                  :key="opt.id"
+                  :label="opt.label"
+                  :value="opt.id"
+                />
+              </el-select>
+            </el-col>
             <el-col :span="4" style="width: 66px; float: right">
               <el-button
                 type="primary"
@@ -74,7 +94,7 @@
             </el-col>
           </el-row>
           <el-row style="padding: 10px 0 0 0">
-            <el-col :span="6" style="width: 430px">
+            <el-col :span="6" style="width: 380px">
               <div class="fl" style="line-height: 28px; padding: 0 12px 0 0">
                 结束时间:
               </div>
@@ -88,6 +108,34 @@
               />
             </el-col>
 
+            <el-col :span="3" style="margin-right:10px">
+              <el-input
+                v-model="parmValue['业务人员PROP']"
+                size="mini"
+                placeholder="业务人员"
+                clearable
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              />
+            </el-col>
+
+            <el-col :span="3">
+              <el-input
+                v-model="parmValue['业务人员部门']"
+                size="mini"
+                placeholder="业务人员部门"
+                clearable
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              />
+            </el-col>
+
             <el-col :span="4" style="width: 66px; float: right">
               <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">
                 重置
@@ -127,6 +175,9 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
+        status: '',
+        '业务人员PROP': '',
+        '业务人员部门PROP': '',
         companyName: '', // 客户名称
         start_date: '', // 起始时间
         end_date: '', // 结束时间
@@ -136,6 +187,16 @@ export default {
         page: 1, // 页码
         size: 15 // 每页显示条数
       },
+      statusOptions: [
+        { id: '0', label: '待发布竞标' },
+        { id: '1', label: '招标进行中' },
+        { id: '2', label: '招标已结束' },
+        { id: '3', label: '待选择商品' },
+        { id: '4', label: '已选商品待下单' },
+        { id: '5', label: '已成功转单' },
+        { id: '6', label: '超时已关闭' },
+        { id: '7', label: '招标已暂停' }
+      ],
       // 表格 - 数据集合
       tableData: [],
       // 表格 - 参数
@@ -189,6 +250,9 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        status: '',
+        '业务人员PROP': '',
+        '业务人员部门PROP': '',
         companyName: '', // 客户名称
         start_date: '', // 新建起始时间
         end_date: '', // 新建结束时间

src/views/reportQuery/purchaseReport/components/table7.vue

@@ -1,68 +1,68 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table7"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @selection="selection_change"
-      >
-        <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-             
-               <el-col :span="6" style="width: 363px;">
-                <periodDatePickerActive
-                      :start="parmValue.start_date"
-                      :end="parmValue.end_date"
-                      :placeholder="'创建'"
-                      :width="'165px'"
-                      :size="searchSize"
-                      @timeReturned="time"
-                    />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>  
-            </el-row>
-            <!-- <el-row style="padding: 10px 0 0 0">
-              
+  <div>
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table7"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @selection="selection_change"
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 0 80px">
+
+            <el-col :span="6" style="width: 363px;">
+              <periodDatePickerActive
+                :start="parmValue.start_date"
+                :end="parmValue.end_date"
+                :placeholder="'创建'"
+                :width="'165px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
+                导出
+              </el-button>
+            </el-col>
+            <el-col :span="3" style="width: 66px; float: right">
+              <el-button
+                :size="searchSize"
+                type="primary"
+                style="float: right; margin-left: 5px"
+                @click="searchList"
+              >
+                刷新
+              </el-button>
+            </el-col>
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button
+                type="warning"
+                class="fr"
+                :size="searchSize"
+                @click="restSearch"
+              >
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+          <!-- <el-row style="padding: 10px 0 0 0">
+
               <el-col :span="6" style="width: 363px;">
                 <periodDatePickerActive
                       :start="parmValue.start_date"
@@ -72,8 +72,8 @@
                       :size="searchSize"
                       @timeReturned="time"
                     />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
+              </el-col>
+              <el-col :span="4" style="width: 66px; float: right">
                 <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
                     导出
                 </el-button>
@@ -97,54 +97,52 @@
                 >
                   重置
                 </el-button>
-              </el-col>     
+              </el-col>
             </el-row> -->
-          </div>
-       </template>
+        </div>
+      </template>
 
-        
-      </ex-table>
-    </div>
+    </ex-table>
+  </div>
 
-  
 </template>
-   <script>
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-import urlConfig from "@/apis/url-config";
-import asyncRequest from "@/apis/service/reportQuery/purchaseReport";
-import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table7} from "./columns";
-import { mapGetters } from "vuex";
+<script>
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
+import urlConfig from '@/apis/url-config'
+import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import periodDatePickerActive from '../period-date-picker/main.vue'
+import { table7 } from './columns'
+import { mapGetters } from 'vuex'
 
 export default {
-  name: "purchaseOrder",
-  mixins: [mixinPage, resToken],
+  name: 'PurchaseOrder',
   components: {
     periodDatePickerActive
   },
+  mixins: [mixinPage, resToken],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
+
   },
   data() {
     return {
-      //选中数组
+      // 选中数组
       changeList: [],
-      //全局url
+      // 全局url
       fileUrl: urlConfig.baseURL,
-      //loading
+      // loading
       loading: false,
-      //请求参数集合
+      // 请求参数集合
       parmValue: {
-        
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
+
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
         // is_export:0,//是否导出0/1
 
         page: 1, // 页码
-        size: 15, // 每页显示条数
-       
+        size: 15 // 每页显示条数
+
       },
       // 表格 - 数据集合
       tableData: [],
@@ -152,166 +150,165 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格表头 - 列参数
-      table7: table7,
-    };
+      table7: table7
+    }
   },
   mounted() {
-
-    this.searchList();
+    this.searchList()
   },
 
   methods: {
-    //初始化http请求
+    // 初始化http请求
     async searchList() {
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("时间区间不完整！");
-        return;
+        this.$message.warning('时间区间不完整！')
+        return
       }
-      this.loading = true;
-      
-      const res = await asyncRequest.reportorderlistdetailed(this.parmValue);
+      this.loading = true
+
+      const res = await asyncRequest.reportorderlistdetailed(this.parmValue)
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
+        this.tableData = res.data.list
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
         this.$message.warning(res.message)
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
-      this.loading = false;
+      this.loading = false
     },
-   
-    //重置
+
+    // 重置
     restSearch() {
       this.parmValue = {
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
+        start_date: '', // 新建起始时间
+        end_date: '', // 新建结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
+        size: 15 // 每页显示条数
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.searchList();
+        total: 0
+      }
+      this.searchList()
     },
-    
+
     // 时间函数
     async time(e) {
-      this.parmValue.start_date = e.startTime || "";
-      this.parmValue.end_date = e.endTime || "";
+      this.parmValue.start_date = e.startTime || ''
+      this.parmValue.end_date = e.endTime || ''
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("时间区间不完整！");
-        return;
+        this.$message.warning('时间区间不完整！')
+        return
       }
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
 
-     //选中触发函数
+    // 选中触发函数
     selection_change(e) {
-      const { list } = e;
-      //选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
+      const { list } = e
+      // 选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
     },
-    //导出文件 
+    // 导出文件
     async download() {
       // if(this.changeList.length<=0){
       //   this.$message.warning("请选择有效数据")
       //   return;
       // }
-      let model = JSON.parse(JSON.stringify(this.parmValue))
+      const model = JSON.parse(JSON.stringify(this.parmValue))
       // model.is_export = 1;
-      let start_date = new Date(this.parmValue.start_date).valueOf();
-      let end_date = new Date(this.parmValue.end_date).valueOf();
-      let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
-      if(this.parmValue.start_date != "" && this.parmValue.end_date != ""){
-        if(flag){
-          this.$message.warning("导出文件的时间区间不能超过30天")
-          return;
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const end_date = new Date(this.parmValue.end_date).valueOf()
+      const flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000
+      if (this.parmValue.start_date != '' && this.parmValue.end_date != '') {
+        if (flag) {
+          this.$message.warning('导出文件的时间区间不能超过30天')
+          return
         }
-      }else{
-        this.$message.warning("请选择导出文件的时间区间")
-        return;
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
       }
       if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
+        this.loading = true
+        const httpType = `aplication/zip`
         axios({
-          method: "post",
-          url: this.fileUrl + "admin/reportorderlistdetailedexport",
-          responseType: "blob",
+          method: 'post',
+          url: this.fileUrl + 'admin/reportorderlistdetailedexport',
+          responseType: 'blob',
           data: model,
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
+            Accept: httpType
+          }
         })
           .then((res) => {
             // console.log(res)
             // console.log(this.fileUrl)
             // return;
             if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
+              const url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
                   type: httpType
                 })
-              );
-              let link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              let excelName = "订单明细报表.zip";
-              link.setAttribute("download", excelName);
-              document.body.appendChild(link);
-              link.click();
-              link.remove();
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-              this.$message.success(`导出成功！`);
+              )
+              const link = document.createElement('a')
+              link.style.display = 'none'
+              link.href = url
+              const excelName = '订单明细报表.zip'
+              link.setAttribute('download', excelName)
+              document.body.appendChild(link)
+              link.click()
+              link.remove()
+              window.URL.revokeObjectURL(url) // 释放掉blob对象
+              this.$message.success(`导出成功！`)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             } else {
-              this.$message.error(res.data.message);
+              this.$message.error(res.data.message)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             }
           })
           .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
+            console.log(error)
+            this.loading = false
+          })
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
    <style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
 </style>
-   
+

src/views/sellOut/filing/cpns/baseDetail.vue

@@ -23,15 +23,12 @@
                 "
               />
             </template>
-
             <template slot="expect_service_proportion">
               <span>{{ sitem.expect_service_proportion }}%</span>
             </template>
-
             <template slot="service_proportion">
               <span>{{ sitem.service_proportion }}%</span>
             </template>
-
             <template slot="supplierName">
               <span>{{ sitem.supplierName }}</span>
               <el-popover placement="top" width="300" trigger="hover">
@@ -70,7 +67,6 @@
                 <i slot="reference" class="el-icon-warning-outline fr" />
               </el-popover>
             </template>
-
             <template slot="is_determine_price">
               <el-tag
                 :size="'mini'"
@@ -181,9 +177,7 @@ import resToken from '@/mixins/resToken'
 import { mapGetters } from 'vuex'
 
 import {
-  editColumns,
   costArr,
-  bargainingArr,
   options1,
   options2,
   options3,
@@ -196,8 +190,10 @@ import {
   options10,
   options11,
   options13,
-  statusOptions,
+  editColumns,
   coveColumns,
+  bargainingArr,
+  statusOptions,
   is_determine_price_options
 } from '../config/columns'
 

src/views/sellOut/filing/cpns/baseForm.vue

@@ -18,11 +18,30 @@
               maxlength="100"
               :disabled="type === 'view'"
               v-model="ruleForm.companyName"
-            ></el-input>
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="总数量" prop="num">
+            <el-input
+              placeholder="总数量"
+              :disabled="type === 'view'"
+              v-model="ruleForm.num"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="总价" class="clear">
+            <el-input disabled :value="Number(total).toFixed(2)" />
           </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
           <el-form-item label="业务公司" prop="customerCode">
             <search-work-company
-              :disabled="type === 'view'"
+              :disabled="true"
               :value="ruleForm.customerCode"
               :placeholder="'业务公司'"
               :size="'mini'"
@@ -34,7 +53,9 @@
                 :isDetail="type !== 'add'"
                 :isp="this.type !== 'view'" -->
             <search-supplier
+              :is-detail="true"
               :value="ruleForm.supplierNo"
+              :names="supplierName"
               :placeholder="'供应商'"
               :disabled="type === 'view'"
               :size="'mini'"
@@ -237,12 +258,13 @@
             <el-row>
               <el-col :span="14">
                 <el-form-item label="分类" prop="cat_id">
-                  <search-sort
+                  <company-sort
                     :value="ruleForm.cat_id"
                     :placeholder="'分类'"
                     :size="'mini'"
                     :names="cat_id_name"
-                    :disabled="type === 'view'"
+                    :disabled="type === 'view' || ruleForm.customerCode.length === 0"
+                    :company-no="ruleForm.customerCode"
                     :isDetail="true"
                     @searchChange="cat_id_change"
                   />
@@ -480,7 +502,7 @@
         </el-row>
       </el-col>
 
-      <el-col :span="24" v-show="pid === '6'">
+      <el-col :span="24" v-show="is_noble">
         <el-row>
           <el-col :span="12">
             <el-form-item label="金属重量" prop="gold_weight">
@@ -621,7 +643,9 @@ import asyncRequest from "@/apis/service/sellOut/filing";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import baseFormAddEdit from "./baseFormAddEdit";
-import { add_sum, accSub, accMul, accDiv } from "@/utils/validate";
+import { add_sum, accMul, accDiv, accSub } from "@/utils/validate";
+import companyHelper from "@/mixins/companyHelper";
+
 import {
   options1,
   options2,
@@ -641,7 +665,7 @@ import {
 
 export default {
   name: "goodsCostAdd",
-  mixins: [resToken],
+  mixins: [resToken, companyHelper],
   props: ["showModel", "id", "type", "sitem", "askItem", "newTime", "editId"],
   components: {
     baseFormAddEdit,
@@ -655,6 +679,11 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    total() {
+      const { is_determine_price, expect_service, num } = this.ruleForm;
+      const prop = is_determine_price === "1" ? "price" : "cgd_charge";
+      return accMul(add_sum(this.ruleForm[prop], expect_service), num);
+    },
   },
   watch: {
     newTime: function (val) {
@@ -666,8 +695,7 @@ export default {
 
   data() {
     return {
-      service_edit: false,
-      prop_edit: true,
+      supplierName: [],
       pid: "",
       cat_id_name: "",
       // supplierNo: "",
@@ -979,7 +1007,7 @@ export default {
                 message: "",
               });
               this.showModelThis = false;
-              this.$router.push("/report/index");
+              this.$router.push("/supplierSellOut/supplierFiling");
             }
           }
         } else {
@@ -1047,6 +1075,10 @@ export default {
           this.$refs.ruleForm.clearValidate();
           this.spec_tableData = [];
           this.is_noble = false;
+
+          if (this.type === "add") {
+            this.ruleForm.customerCode = this.currentCompany;
+          }
         }
       });
     },
@@ -1080,14 +1112,14 @@ export default {
     },
     //分类选择
     async cat_id_change(e) {
-      const { pid, id, label } = e;
+      const { pid, id, label, is_gold } = e;
       this.pid = pid || "";
       this.ruleForm.cat_id = id ? [id] : [];
 
       this.$refs.ruleForm.validateField("cat_id");
 
       const { is_gold_price } = this.ruleForm;
-      this.is_noble = this.pid === "6" && is_gold_price === "1";
+      this.is_noble = is_gold;
       this.setrules();
 
       if (this.is_noble) {
@@ -1119,9 +1151,10 @@ export default {
     },
     //供应商选择
     supplierNosearchChange(e) {
-      const { code } = e;
+      const { code, name } = e;
       this.ruleForm.supplierNo = code ? [code] : [];
-      this.$refs.ruleForm.validateField("supplierNo");
+      this.supplierName = name;
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("supplierNo");
     }, //业务公司选择
     company_idsearchChange(e) {
       const { code } = e;

src/views/sellOut/sellOutOrder/columns.js

@@ -152,12 +152,128 @@ const columns = [
   }
 ]
 
+// const showColumns = [
+//   {
+//     prop: 'outCode',
+//     label: '发货单号',
+//     span: 6
+//   },
+//   {
+//     prop: 'status',
+//     label: '发货单状态',
+//     _slot_: 'status',
+//     span: 6
+//   },
+//   {
+//     prop: 'orderCode',
+//     label: '订单编号',
+//     span: 6
+//   },
+//   {
+//     prop: 'order_type',
+//     label: '商品类型',
+//     _slot_: 'order_type',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'apply_name',
+//     label: '申请人',
+//     span: 6
+//   },
+//   {
+//     prop: 'send_num',
+//     label: '发货数量',
+//     span: 6
+//   },
+//   {
+//     prop: 'check_num',
+//     label: '验收数量',
+//     span: 6
+//   },
+//   {
+//     prop: 'sendtime',
+//     label: '发货时间',
+//     span: 6
+//   },
+//   {
+//     prop: 'error_num',
+//     label: '异常数量',
+//     span: 6
+//   },
+//   {
+//     prop: 'sale_price',
+//     label: '商品单价',
+//     _slot_: 'sale_price',
+//     span: 6
+//   },
+//   {
+//     prop: 'total_price',
+//     label: '总价',
+//     _slot_: 'total_price',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'addtime',
+//     label: '创建时间',
+//     span: 6
+//   },
+//   {
+//     prop: 'post_code',
+//     label: '物流编号',
+//     span: 12
+//   },
+//   {
+//     prop: 'post_name',
+//     label: '快递公司',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'post_fee',
+//     label: '物流费用',
+//     span: 6
+//   },
+//   {
+//     prop: 'contactor',
+//     label: '收货联系人',
+//     span: 6
+//   },
+//   {
+//     prop: 'mobile',
+//     label: '收货联系人电话',
+//     span: 6
+//   },
+//   {
+//     prop: 'addr',
+//     label: '收货地址',
+//     span: 12
+//   }
+//   // {
+//   //   prop: 'remark',
+//   //   label: '发货备注',
+//   //   span: 24
+//   // },
+//   // {
+//   //   prop: 'saleinfo',
+//   //   label: 'bn仓库',
+//   //   _slot_: 'saleinfo',
+//   //   span: 24
+//   // }
+// ]
+
 const showColumns = [
   {
     prop: 'outCode',
     label: '发货单号',
     span: 6
   },
+  {
+    prop: 'poCode',
+    label: '平台订单编号',
+    span: 6
+  },
   {
     prop: 'status',
     label: '发货单状态',
@@ -225,7 +341,7 @@ const showColumns = [
     span: 12
   },
   {
-    prop: 'post_name',
+    prop: 'post_code',
     label: '快递公司',
     span: 6
   },
@@ -243,12 +359,12 @@ const showColumns = [
   {
     prop: 'mobile',
     label: '收货联系人电话',
-    span: 6
+    span: 4
   },
   {
     prop: 'addr',
     label: '收货地址',
-    span: 12
+    span: 8
   }
   // {
   //   prop: 'remark',

src/views/supplierPurchaseIn/supplierDeliveryWorkOrder/components/ShowDataTableColumns.js

@@ -75,6 +75,21 @@ const showColumns = [
     prop: 'post_fee',
     label: '物流费用',
     span: 12
+  },
+  {
+    prop: 'contactor',
+    label: '收货人',
+    span: 8
+  },
+  {
+    prop: 'mobile',
+    label: '收货电话',
+    span: 8
+  },
+  {
+    prop: 'addr',
+    label: '收货地址',
+    span: 8
   }
 ]
 

src/views/supplierSellOut/supplierFiling/cpns/baseForm.vue

@@ -5,7 +5,7 @@
     :rules="rules"
     ref="ruleForm"
     :size="'mini'"
-    v-loading="loading"
+    v-loading="loading" 
     label-width="85px"
     class="demo-ruleForm"
   >
@@ -18,7 +18,7 @@
               maxlength="100"
               :disabled="type === 'view'"
               v-model="ruleForm.companyName"
-            ></el-input>
+            />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -31,7 +31,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="总价" class="clear">11</el-form-item>
+          <el-form-item label="总价" class="clear">
+            <el-input disabled :value="Number(total).toFixed(2)" />
+          </el-form-item>
         </el-col>
       </el-row>
 
@@ -110,7 +112,9 @@
                 :isDetail="type !== 'add'"
                 :isp="this.type !== 'view'" -->
             <search-supplier
+              :is-detail="true"
               :value="ruleForm.supplierNo"
+              :names="supplierName"
               :placeholder="'供应商'"
               :disabled="type === 'view'"
               :size="'mini'"
@@ -174,12 +178,13 @@
               ></el-col>
               <el-col :span="14">
                 <el-form-item label="分类" prop="cat_id">
-                  <search-sort
+                  <company-sort
                     :value="ruleForm.cat_id"
                     :placeholder="'分类'"
                     :size="'mini'"
                     :names="cat_id_name"
-                    :disabled="type === 'view'"
+                    :disabled="type === 'view' || ruleForm.customerCode.length === 0"
+                    :company-no="ruleForm.customerCode"
                     :isDetail="true"
                     @searchChange="cat_id_change"
                   />
@@ -415,7 +420,7 @@
         </el-row>
       </el-col>
 
-      <el-col :span="24" v-show="pid === '6'">
+      <el-col :span="24" v-show="is_noble">
         <el-row>
           <el-col :span="12">
             <el-form-item label="金属重量" prop="gold_weight">
@@ -557,6 +562,8 @@ import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import baseFormAddEdit from "./baseFormAddEdit";
 import { add_sum, accMul, accDiv, accSub } from "@/utils/validate";
+import companyHelper from '@/mixins/companyHelper';
+
 import {
   options1,
   options2,
@@ -576,7 +583,7 @@ import {
 
 export default {
   name: "goodsCostAdd",
-  mixins: [resToken],
+  mixins: [resToken, companyHelper],
   props: ["showModel", "id", "type", "sitem", "askItem", "newTime", "editId"],
   components: {
     baseFormAddEdit,
@@ -590,6 +597,11 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    total(){
+       const { is_determine_price,expect_service,num} = this.ruleForm;
+        const prop = is_determine_price === "1" ? "price" : "cgd_charge";
+      return  accMul(add_sum(this.ruleForm[prop],expect_service),num)
+    }
   },
   // watch: {
   //   newTime: function (val) {
@@ -601,6 +613,7 @@ export default {
 
   data() {
     return {
+      supplierName:[],
       pid: "",
       cat_id_name: "",
       // supplierNo: "",
@@ -662,6 +675,10 @@ export default {
       // }
       this.rulesThis = this.rules;
 
+      if(this.type === 'add'){
+        this.supplierNosearchChange(this.getCompanyWithCode(this.currentCompany))
+      }
+
       // this.resetFormData();
       await this.resetForm();
 
@@ -851,7 +868,7 @@ export default {
                 message: "",
               });
               this.showModelThis = false;
-              this.$router.push("/report/index");
+              this.$router.push("/supplierSellOut/supplierFiling");
             }
           }
         } else {
@@ -952,14 +969,14 @@ export default {
     },
     //分类选择
     async cat_id_change(e) {
-      const { pid, id, label } = e;
+      const { pid, id, label, is_gold } = e;
       this.pid = pid || "";
       this.ruleForm.cat_id = id ? [id] : [];
 
       this.$refs.ruleForm.validateField("cat_id");
 
       const { is_gold_price } = this.ruleForm;
-      this.is_noble = this.pid === "6" && is_gold_price === "1";
+      this.is_noble = is_gold;
       this.setrules();
 
       if (this.is_noble) {
@@ -991,9 +1008,10 @@ export default {
     },
     //供应商选择
     supplierNosearchChange(e) {
-      const { code } = e;
+      const { code, name } = e;
       this.ruleForm.supplierNo = code ? [code] : [];
-      this.$refs.ruleForm.validateField("supplierNo");
+      this.supplierName = name 
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("supplierNo");
     }, //业务公司选择
     company_idsearchChange(e) {
       const { code } = e;

src/views/supplierSellOut/supplierSellOutOrder/columns.js

@@ -43,7 +43,7 @@ const columns = [
     _slot_: 'order_type',
     width: '100'
   },
-   {
+  {
     prop: 'wsm_supplier',
     label: '供应商',
     minWidth: '150px'
@@ -54,7 +54,6 @@ const columns = [
   //   width: "160"
   // },
 
-
   {
     prop: 'send_num',
     label: '发货数量',
@@ -154,12 +153,132 @@ const columns = [
   }
 ]
 
+// const showColumns = [
+//   {
+//     prop: 'outCode',
+//     label: '发货单号',
+//     span: 6
+//   },
+//   {
+//     prop: 'status',
+//     label: '发货单状态',
+//     _slot_: 'status',
+//     span: 6
+//   },
+//   {
+//     prop: 'orderCode',
+//     label: '订单编号',
+//     span: 6
+//   },
+//   {
+//     prop: 'order_type',
+//     label: '商品类型',
+//     _slot_: 'order_type',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'apply_name',
+//     label: '申请人',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'sendtime',
+//     label: '发货时间',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'send_num',
+//     label: '发货数量',
+//     span: 6
+//   },
+//   {
+//     prop: 'check_num',
+//     label: '验收数量',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'error_num',
+//     label: '异常数量',
+//     span: 6
+//   },
+//   {
+//     prop: 'sale_price',
+//     label: '商品单价',
+//     _slot_: 'sale_price',
+//     span: 6
+//   },
+//   {
+//     prop: 'total_price',
+//     label: '总价',
+//     _slot_: 'total_price',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'addtime',
+//     label: '创建时间',
+//     span: 6
+//   },
+//   {
+//     prop: 'post_name',
+//     label: '快递公司',
+//     span: 6
+//   },
+
+//   {
+//     prop: 'post_fee',
+//     label: '物流费用',
+//     span: 6
+//   },
+//   {
+//     prop: 'contactor',
+//     label: '收货联系人',
+//     span: 6
+//   },
+//   {
+//     prop: 'mobile',
+//     label: '收货联系人电话',
+//     span: 6
+//   },
+//   {
+//     prop: 'post_code',
+//     label: '物流编号',
+//     span: 12
+//   },
+//   {
+//     prop: 'addr',
+//     label: '收货地址',
+//     span: 12
+//   },
+
+//   {
+//     prop: 'remark',
+//     label: '发货备注',
+//     span: 24
+//   },
+//   {
+//     prop: 'saleinfo',
+//     label: 'bn仓库',
+//     _slot_: 'saleinfo',
+//     span: 24
+//   }
+// ]
+
 const showColumns = [
   {
     prop: 'outCode',
     label: '发货单号',
     span: 6
   },
+  {
+    prop: 'poCode',
+    label: '平台订单编号',
+    span: 6
+  },
   {
     prop: 'status',
     label: '发货单状态',
@@ -183,13 +302,6 @@ const showColumns = [
     label: '申请人',
     span: 6
   },
-
-  {
-    prop: 'sendtime',
-    label: '发货时间',
-    span: 6
-  },
-
   {
     prop: 'send_num',
     label: '发货数量',
@@ -200,7 +312,11 @@ const showColumns = [
     label: '验收数量',
     span: 6
   },
-
+  {
+    prop: 'sendtime',
+    label: '发货时间',
+    span: 6
+  },
   {
     prop: 'error_num',
     label: '异常数量',
@@ -225,7 +341,12 @@ const showColumns = [
     span: 6
   },
   {
-    prop: 'post_name',
+    prop: 'post_code',
+    label: '物流编号',
+    span: 12
+  },
+  {
+    prop: 'post_code',
     label: '快递公司',
     span: 6
   },
@@ -243,31 +364,26 @@ const showColumns = [
   {
     prop: 'mobile',
     label: '收货联系人电话',
-    span: 6
-  },
-  {
-    prop: 'post_code',
-    label: '物流编号',
-    span: 12
+    span: 4
   },
   {
     prop: 'addr',
     label: '收货地址',
-    span: 12
-  },
-
-  {
-    prop: 'remark',
-    label: '发货备注',
-    span: 24
-  },
-  {
-    prop: 'saleinfo',
-    label: 'bn仓库',
-    _slot_: 'saleinfo',
-    span: 24
+    span: 8
   }
+  // {
+  //   prop: 'remark',
+  //   label: '发货备注',
+  //   span: 24
+  // },
+  // {
+  //   prop: 'saleinfo',
+  //   label: 'bn仓库',
+  //   _slot_: 'saleinfo',
+  //   span: 24
+  // }
 ]
+
 const rshowColumns = [
   {
     prop: 'returnCode',