feat:业务报备(部分)

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

@@ -3,15 +3,18 @@ import http from '@/apis/axios'
 const api = 'admin/' 
 export default {
   cancel: (data) => http(api + 'filingCancel', data, 'post'),
-  // 线上商品详情
   goods_detail: (data, params) => http(api + 'goodinfo', data, 'post', params),
-  // 区编码获取省市区汉字
   addrall: (data, params) => http(api + 'addrall', data, 'post', params),
-  // 添加
   add: (data, params) => http(api + 'salecreate', data, 'post', params),
-  // 验证售价
   salegetprice: (data, params) => http(api + 'salegetprice', data, 'post', params),
-  list: (data, params) => http('/bbc/fill/list', data, 'post', params),
   addrall: (data, params) => http(api + 'addrall', data, 'post', params),
-  transfer: (data) => http(api + 'filingTransfer', data, 'post')
+  
+  // 列表
+  list: (data, params) => http('/bbc/fill/list', data, 'post', params),
+  // 转单
+  transfer: (data) => http('bbc/fill/transfer', data, 'post'),
+  // 获取详情
+  detail: (data, params) => http('bbc/fill/info', data, 'post', params),
+  // 是否合规
+  compliance: (data, params) => http('bbc/fill/compliance', data, 'post', params),
 }

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

@@ -41,5 +41,6 @@ export default {
   catinfo: (data, params) => http(api + 'catinfo', data, 'post', params),
   // 复制竞价单
   copy: (data, params) => http(api + 'zxcopy', data, 'post', params),
-  zxcopyedit: (data, params) => http(api + 'zxcopyedit', data, 'post', params)
+  zxcopyedit: (data, params) => http(api + 'zxcopyedit', data, 'post', params),
+  transferFilling: (data, params) => http('bbc/fill/zixunCreate', data, 'post', params),
 }

src/config/env.development.js

@@ -5,11 +5,11 @@ module.exports = {
   wechatUrl: "http://rep.test241.wanyuhengtong.com", // 微信授权地址
   backUrl: "http://webstock3.test241.wanyuhengtong.com", // 微信授权后重定向地址
   api: {
-    baseApi: 'http://stock.api.caixiao365.com/',
-    userApi: "http://user.api.caixiao365.com/"
+    baseApi: 'http://stocknew.test241.wanyuhengtong.com/',
+    userApi: "http://user.test241.wanyuhengtong.com/"
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
-  webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',
+  webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
   // 分仓
@@ -24,10 +24,10 @@ module.exports = {
   // 结算平台url
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
-  settlementPlatformUrl: 'http://fin.caixiao365.com/',
+  settlementPlatformUrl: 'http://webcx.test241.wanyuhengtong.com/',
   // 工单管理系统url
-  GDUrl: 'http://bug.caixiao365.com/',
-  dashboardUrl: 'http://web.report.caixiao365.com/',
+  GDUrl: 'http://http://bugweb.test241.wanyuhengtong.com/',
+  dashboardUrl:"http://web.report.caixiao365.com/",
   // token加密key
   secretKey: 'key123',
   loginTitle: '',

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

@@ -5,12 +5,6 @@ const addColumns = [
     _slot_: 'good_name',
     span: 24
   },
-  // {
-  //   prop: "good_info_img",
-  //   _slot_: "good_info_img",
-  //   label: "详情图",
-  //   span: 24,
-  // },
   {
     prop: 'cat',
     label: '分类',

src/views/sellOut/businessFiling/components/complianceForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <ElForm size="mini" label-width="110px" :model="formData" :rules="rules">
+  <ElForm size="mini" label-width="110px" :model="formData" :rules="rules" ref="formRef" v-loading="loading">
     <ElRow>
       <ElCol :span="12">
         <ElFormItem label="是否合规" prop="status">
           <ElSelect style="width:100%" v-model="formData.status">
             <ElOption label="合规" value="1" />
-            <ElOption label="不合规" value="0" />
+            <ElOption label="不合规" value="2" />
           </ElSelect>
         </ElFormItem>
       </ElCol>
@@ -24,7 +24,7 @@
 
       <ElCol :span="24">
         <ElFormItem style="display:flex;justify-content:flex-end;width:100%">
-          <ElButton type="primary">保存</ElButton>
+          <ElButton type="primary" @click="onSubmit">保存</ElButton>
         </ElFormItem>
       </ElCol>
     </ElRow>
@@ -32,9 +32,12 @@
 </template>
 
 <script>
+import asyncRequest from "@/apis/service/sellOut/businessFiling";
 export default {
-  data(){
+  props: ["id"],
+  data() {
     return {
+      loading: false,
       formData:{
         status: "1",
         platCode: "",
@@ -42,15 +45,42 @@ export default {
       }
     }
   },
-  computed:{
+  computed: {
      rules(){
         const { status }  = this.formData;
+        
         return {
           status:[{required:true, message:"请选择是否合规", trigger: "change"}],
           platCode:[{required:status === "1", message:"请输入平台订单号", trigger: "change"}],
-          remark:[{required:status === "0", message: "请输入备注", trigger:"change" }]
+          remark:[{required:status === "2", message: "请输入备注", trigger:"change" }]
+        }
+      }
+  },
+  methods: {
+    async onSubmit(){
+      this.loading = true
+      try{
+        await this.$refs.formRef.validate();
+        const { status :is_compliance, platCode: plat_code, remark: compliance_remark } = this.formData;
+        const model = {is_compliance, plat_code, compliance_remark,id: this.id };
+        const response = await asyncRequest.compliance(model)
+        if(response.code === 0){
+          this.$emit("refresh")
+
+          this.formData = {
+            status: "1",
+            platCode: "",
+            remark:""
+          }
+        }else{
+          this.$message.warning(response.message)
         }
+      }catch(err){
+        console.error(err)
+      } finally{
+        this.loading = false;
       }
+    }
   }
 }
 </script>

src/views/sellOut/businessFiling/components/waitTransferred.vue

@@ -158,7 +158,7 @@ const defaultAddressData = {
 
 export default {
   components: { InAddressModal },
-  props: ["id", "num"],
+  props: ["id", "num", "waitNum"],
   data() {
     return {
       ruleForm: {
@@ -248,8 +248,7 @@ export default {
         const { data, code } = await asyncRequest.addrall({ code: addr_code[addr_code.length - 1] });
 
         if (Number(code) === 0) {
-          this.editCacheData.addr_code_name =
-            data.province.name + "/" + data.city.name + "/" + data.area.name;
+          this.editCacheData.addr_code_name = data.province.name + "/" + data.city.name + "/" + data.area.name;
         }
 
         this.$set(this.list, this.editIndex, this.editCacheData);
@@ -336,29 +335,26 @@ export default {
         return;
       }
 
-      const currentNum = this.list.reduce((current, prev) => {
-        return Number(current) + Number(prev.receipt_quantity);
-      }, 0);
-
-      if (currentNum > Number(this.num)) {
-        this.$message.warning(
-          `未转单数量为${this.num},收货数量总和不能超过未转单数量！`
-        );
+      const currentNum = this.list.reduce((current, prev) => Number(current) + Number(prev.receipt_quantity), 0);
+      if (currentNum > Number(this.waitNum)) {
+        this.$message.warning( `未转单数量为${this.waitNum},收货数量总和不能超过未转单数量！`);
         return;
       }
 
+      this.loading = true
       const { code, message } = await asyncRequest.transfer({
         id: this.id,
         addr_list: this.list,
-
-        customerCode: Array.isArray(this.ruleForm.companyCode)
-          ? this.ruleForm.companyCode[0]
-          : this.ruleForm.companyCode
+        customerCode: Array.isArray(this.ruleForm.companyCode) ? this.ruleForm.companyCode[0]  : this.ruleForm.companyCode,
+        poCode: this.ruleForm.platCode,
       });
 
+      this.loading = false
+
       if (Number(code) === 0) {
         this.list = [];
         this.ruleForm.companyCode = "";
+        this.ruleForm.platCode = "";
         this.$emit("refresh");
       } else {
         this.$message.error(message);

src/views/sellOut/businessFiling/config/columns.js

@@ -5,25 +5,27 @@ const columns = [
     width: '155px'
   },
   {
-    prop: 'catinfo',
     label: '商品分类',
-    width: '158px'
+    width: '158px',
+    _slot_: "cat_info"
   },
   {
     prop: "good_name",
-    label:"商品名称"
+    label: "商品名称",
+    width: "150px"
   },
   {
+    label: "合规状态",
     prop:  "is_compliance",
     _slot_: "is_compliance"
   },
   {
-    label: "todo",
-    prop: "销售数量",
+    label: "销售数量",
+    prop: "todo"
   },
   {
-    prop: "todo",
     label: '商品主图',
+    prop: "todo"
   },
   {
     prop: "origin_price",
@@ -33,14 +35,24 @@ const columns = [
     prop: "good_price",
     label: '销售价'
   },
+  // {
+  //   prop: 'todo',
+  //   label: '总服务费',
+  // },
   {
-    prop: 'todo',
-    label: '总服务费',
+    label: '业务公司',
+    _slot_: "company",
+    width: "180px"
+  },
+  {
+    label: '供应商公司',
+    _slot_: "supplier",
+    width: "180px"
   },
   {
-    prop: 'companyNo',
     label: '企业客户',
-    _slot_: "company"
+    _slot_: "customer",
+    width: "180px"
   },
   {
     prop: 'status',
@@ -49,7 +61,7 @@ const columns = [
     _slot_: 'status'
   },
   {
-    prop: 'todo',
+    prop: 'plat_code',
     label: '平台商品编号',
     'min-width': '145px'
   },
@@ -85,24 +97,21 @@ export const options13 = [
 ]
 
 const statusOptions = [
-  { value: '0', label: '待审核是否合规' },
-  { value: '1', label: '审核不合规' },
-  { value: '2', label: '已合规待转单' },
-  { value: '3', label: '已部分转单' },
-  { value: '4', label: '已全部转单' },
-  { value: '5', label: '已取消转单' }
+  { value: '1', label: '待转单' },
+  { value: '2', label: '已部分转单' },
+  { value: '3', label: '转单成功' },
+  { value: '4', label: '已取消转单' }
 ]
 
 export const editColumns = [
   {
-    prop: 'filingCode',
+    prop: 'fillCode',
     label: '报备单编号',
     span: 6
   },
   {
-    prop: 'status',
+    prop: 'status_cn',
     label: '状态',
-    _slot_: 'status',
     span: 6
   },
   {
@@ -124,60 +133,25 @@ export const editColumns = [
   {
     prop: 'customerName',
     label: '业务公司名称',
-    _slot_: 'customerName',
+    _slot_: 'companyName',
     span: 12
   },
   {
     prop: 'companyName',
     label: '客户名称',
-    _slot_: 'companyName',
+    _slot_: 'customerName',
     span: 12
   },
   {
-    prop: 'num',
-    label: '销售数量',
-    span: 6
-  },
-
-  {
-    prop: 'is_determine_price',
-    label: '是否确认售价',
-    _slot_: 'is_determine_price',
-    span: 6
-  },
-
-  {
-    prop: 'cgd_charge',
+    prop: 'origin_price',
     label: '采购单价',
     span: 6
   },
   {
-    prop: 'price',
+    prop: 'good_price',
     label: '销售单价',
     span: 6
   },
-  {
-    prop: 'expect_service',
-    label: '期望服务费',
-    span: 6
-  },
-  {
-    prop: 'expect_service_proportion',
-    label: '期望服务费比例',
-    span: 6,
-    _slot_: 'expect_service_proportion'
-  },
-  {
-    prop: 'service_charge',
-    label: '最终服务费',
-    span: 6
-  },
-  {
-    prop: 'service_proportion',
-    label: '最终服务费比例',
-    _slot_: 'service_proportion',
-    span: 6
-  },
   {
     prop: 'transfer_num',
     label: '已转单数量',
@@ -199,9 +173,15 @@ export const editColumns = [
     span: 6
   },
   {
-    prop: 'platform_name',
+    prop: 'platform_id',
     label: '所属平台',
-    span: 12
+    span: 6
+  },
+  {
+    prop: 'is_compliance',
+    label: '是否合规',
+    _slot_: 'is_compliance',
+    span: 6
   },
   {
     prop: '',
@@ -210,14 +190,15 @@ export const editColumns = [
     span: 6
   },
   {
-    prop: 'plat_orderCode',
-    label: '供应商订单号',
+    prop: 'fill_type',
+    label: '报备单类型',
+    _slot_: "fill_type",
     span: 6
   },
   {
-    prop: 'orderCode',
-    label: '订单编号',
-    span: 12
+    prop: 'fill_remark',
+    label: '备注',
+    span: 24
   }
 ]
 
@@ -305,12 +286,6 @@ export const coveColumns = [
     _slot_: 'good_img',
     span: 24
   },
-  // {
-  //   prop: "noble",
-  //   _slot_: "noble",
-  //   label: "贵金属信息",
-  //   span: 24,
-  // },
   {
     prop: 'cost_desc',
     label: '工艺说明',
@@ -431,13 +406,6 @@ const showColumns = [
     label: '购买方公司',
     _slot_: 'company'
   },
-
-  // {
-  //   prop: "wsm",
-  //   label: "仓库信息",
-  //   _slot_: "wsm",
-  // },
-
   {
     prop: 'total_fee',
     label: '采购总成本',
@@ -582,6 +550,8 @@ const statusList = [
     type: 'info'
   }
 ]
+
+
 const listCol = [
   { type: 'selection', fixed: 'left', _noset_: true },
   {

src/views/sellOut/businessFiling/detail.vue

@@ -4,26 +4,82 @@
       <ElTabPane label="新建业务报备" v-if="isAdd">
         <CreateBusinessForm />
       </ElTabPane>
+
       <template v-else>
         <ElTabPane label="业务报备详情">
           <ElCollapse v-model="actives">
             <ElCollapseItem title="业务报备详情" name="0">
-            </ElCollapseItem>
+              <show-data-table 
+                style="padding: -5px 0 10px 0"
+                :sitem="sitem"
+                :columns="editColumns"
+              >
+                <template #is_compliance="{ scope }">
+                 <el-tag size="mini">
+                  {{sitem.is_compliance === "0" ? "未填写" : sitem.is_compliance === "1" ? "合规" : "不合规"}}
+                </el-tag>
+               </template>
+
+               <template slot="supplierName">
+                 <span>{{ sitem.supplierName }}</span>
+                 <el-popover placement="top" width="300" trigger="hover">
+                   <ul>
+                    <li>
+                      <span>供应商编号：</span><span>{{ sitem.supplierNo }}</span>
+                    </li>
+                   </ul>
+                   <i slot="reference" class="el-icon-warning-outline fr" />
+                 </el-popover>
+                </template>
 
+                <template slot="customerName">
+                    <span>{{ sitem.customerName }}</span>
+                    <el-popover placement="top" width="300" trigger="hover">
+                      <ul>
+                       <li>
+                         <span>企业客户编号：</span><span>{{ sitem.customerCode }}</span>
+                       </li>
+                      </ul>
+                      <i slot="reference" class="el-icon-warning-outline fr" />
+                  </el-popover>
+                </template>
+
+                <template slot="companyName">
+                  <span>{{ sitem.companyName }}</span>
+                  <el-popover v-if="sitem.companyNo" placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>业务公司编号编号：</span><span>{{ sitem.companyNo }}</span>
+                      </li>
+                    </ul>
+                    <i slot="reference" class="el-icon-warning-outline fr" />
+                  </el-popover>
+                </template>
+
+                <template slot="fill_type">
+                 {{(fillTypeOptions.find( ({value}) => value === String(sitem.fill_type)) || {}).label || "--"}}
+                </template>
+              </show-data-table>
+            </ElCollapseItem>
+            
             <ElCollapseItem title="商品详情" name="1">
-              <ShowGoodsDataTable
-                :type="'4'"
-                :skucode="'SN2303222038477600'"
-                :spucode="'SKU2303222034205711'"
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem.fill_type"
+                :skuCode="sitem.skuCode"
+                :spucode="sitem.spuCode"
+                :iscgd="false"
+                :border="true"
               />
             </ElCollapseItem>
             
-            <ElCollapseItem title="是否合规设置" name="2">
-              <ComplianceForm />
+            <ElCollapseItem title="是否合规设置" name="2" v-if="String(sitem.is_compliance) === '0'">
+              <ComplianceForm :id="id" @refresh="initialData" />
             </ElCollapseItem>
 
-            <ElCollapseItem title="待转单" name="3">
-              <WaitTransferred />
+            <ElCollapseItem title="待转单" name="3" v-if="String(sitem.status) === '1' || String(sitem.status) === '2'">
+              <WaitTransferred :id="id" :waitNum="sitem.wait_num" @refresh="initialData" />
             </ElCollapseItem>
           </ElCollapse>
         </ElTabPane>
@@ -36,6 +92,8 @@
 import CreateBusinessForm from './components/createBusinessForm'
 import WaitTransferred from "./components/waitTransferred.vue"
 import ComplianceForm from "./components/complianceForm.vue"
+import asyncRequest from "@/apis/service/sellOut/businessFiling"
+import { editColumns, coveColumns } from "./config/columns"
 
 export default {
   components: {
@@ -45,10 +103,25 @@ export default {
   },
   data(){
     return {
-      actives:["0", "1",  "2", "3"]
+      newTime: "",
+      actives: ["0", "1",  "2", "3"],
+      sitem: {},
+      editColumns,
+      coveColumns,
+      fillTypeOptions: [
+        { value: "1", label: "库存" },
+        { value: "2", label: "非库存" },
+        { value: "3", label: "咨询商品" }
+      ]
     }
   },
+  mounted(){
+    this.initialData();
+  },
   computed:{
+    id(){
+      return this.$route.query.id;
+    },
     isAdd(){
       return this.$route.query.type === "add";
     },
@@ -58,6 +131,15 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     }
+  },
+  methods:{
+    async initialData(){
+      const response = await asyncRequest.detail({id:this.id})
+      if(response.code !== 0) return;
+      this.sitem = response.data;
+      this.sitem.wait_num = response.data.good_num - response.data.transfer_num;
+      this.newTime = (new Date()).valueOf();
+    }
   }
 }
 </script>

src/views/sellOut/businessFiling/index.vue

@@ -29,8 +29,8 @@
                 :type="1"
                 :width="'135px'"
                 :size="searchSize"
-                :start_date="timeOBJ.start_date"
-                :end_date="timeOBJ.end_date"
+                :start="timeOBJ.start"
+                :end="timeOBJ.end"
                 @timeReturned="handleTime"
               />
             </el-col>
@@ -39,7 +39,7 @@
               <el-input
                 size="mini"
                 placeholder="报备单号"
-                v-model="parmValue.filingCode"
+                v-model="parmValue.fillCode"
                 @blur="
                   pageInfo.curr = 1;
                   parmValue.page = 1;
@@ -91,26 +91,14 @@
                 size="mini"
                 :names="khName"
                 :is-detail="type !== 'add'"
-                :value="parmValue.companyCode"
+                :value="parmValue.customerCode"
                 placeholder="客户公司"
                 @searchChange="handleCustomerChange"
               />
             </el-col>
 
-            <el-col :span="4" style="margin-top: 15px;margin-left:10px">
-              <search-supplier
-                :size="'mini'"
-                :value="parmValue.supplierNo"
-                :disabled="false"
-                :placeholder="'供应商名称'"
-                :names="parmValue.supplierName"
-                :is-detail="true"
-                :no-disabled="true"
-                @searchChange="supplierChange"
-              />
-            </el-col>
-
             <el-col :span="4" style="margin-top: 15px; margin-left: 10px">
+
               <el-select
                 clearable
                 size="mini"
@@ -135,9 +123,13 @@
       </template>
 
       <template #is_compliance="{ scope }">
-        {{scope.row.is_compliance === "0" ? "未填写" : scope.row.is_compliance === "1" ? "合规" : "不合规"}}
+        <el-tag size="mini">
+          {{scope.row.is_compliance === "0" ? "未填写" : scope.row.is_compliance === "1" ? "合规" : "不合规"}}
+        </el-tag>
+      </template>
+      <template #cat_info="{ scope }">
+        {{ scope.row.cat.search }}
       </template>
-
       <template #good_img="{ scope }">
         <div v-if="scope.row.good_img" style="width: 20px; height: 20px" class="hover" v-viewer>
           <img
@@ -147,38 +139,32 @@
           />
         </div>
       </template>
-
-      <template #company="{scope}">
-        <div style="display:flex;align-items:center">
-          <el-tooltip :content="'企业客户编码 : ' + (scope.row.companyCode || '--')" placement="top">
+      <template #customer="{ scope }">
+          <el-tooltip :content="'企业客户编码 : ' + (scope.row.customerCode || '--')" placement="top">
             <i
-              v-if="scope.row.companyName"
+              v-if="scope.row.customerName"
               class="el-icon-warning-outline"
               style="margin-right:2px;cursor:pointer"
             />
           </el-tooltip>
-          {{scope.row.companyName}}
-        </div>
+          {{scope.row.customerName}}
       </template>
-
-      <template #customer="{scope}">
-        <div style="display:flex;align-items: center">
-          <el-tooltip :content="'业务公司编码 : ' + (scope.row.customerCode || '--')" placement="top">
-            <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+      <template #company="{ scope }">
+          <el-tooltip :content="'业务公司编码 : ' + (scope.row.companyNo || '--')" placement="top">
+            <i
+              v-if="scope.row.companyName"
+              class="el-icon-warning-outline"
+              style="margin-right:2px;cursor:pointer"
+            />
           </el-tooltip>
-          {{ scope.row.customerName }}
-        </div>
+          {{scope.row.companyName}}
       </template>
-
       <template #supplier="{scope}">
-        <div style="display:flex; align-items:center">
           <el-tooltip :content="'供应商公司编码 : ' + (scope.row.supplierNo || '--')" placement="top">
             <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
           </el-tooltip>
           {{scope.row.supplierName}}
-        </div>
       </template>
-
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
@@ -187,31 +173,9 @@
           "
         ></el-tag>
       </template>
-
       <template #operation="{ scope }">
         <el-tooltip effect="dark" content="详情" placement="top">
-          <i class="el-icon-view tb-icon" @click="getRouter('/sellOut/filingDetail', scope.row.id)"></i>
-        </el-tooltip>
-
-        <el-tooltip effect="dark" content="修改" placement="top">
-          <i
-            v-if="String(scope.row.status) === '1' && !isSupertube && powers.includes('005') && Number(scope.row.wsm_has_account) === 0"
-            class="el-icon-edit tb-icon"
-            @click="getRouter('/sellOut/filingDetail', scope.row.id, 'edit')"
-          />
-        </el-tooltip>
-
-        <el-tooltip effect="dark" content="取消转单" placement="top">
-          <i
-            v-if="
-              String(scope.row.status) !== '4' 
-              && String(scope.row.status) !== '5' 
-              && Number(scope.row.wsm_has_account) === 0
-              && powers.includes('005')
-            "
-            class="el-icon-refresh-right tb-icon"
-            @click="handleCancel(scope.row.id)"
-          ></i>
+          <i class="el-icon-view tb-icon" @click="getRouter('/sellOut/businessFilingDetail', scope.row.id)"></i>
         </el-tooltip>
       </template>
     </ex-table>
@@ -274,8 +238,8 @@ export default {
       select: "1",
       input: "",
       timeOBJ: {
-        start_date: "", //起始时间
-        end_date: "" // 结束时间
+        start: "", //起始时间
+        end: "" // 结束时间
       },
       // 状态
       statusOptions: statusOptions,
@@ -286,10 +250,12 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
-        supplierNo: [],
-        companyCode: [],
-        start_date: "", //新建起始时间
-        end_date: "" // 新建结束时间
+        fillCode: "",
+        good_name: "",
+        customerCode: [],
+        status: "",
+        start: "", //新建起始时间
+        end: "" // 新建结束时间
       },
       tableData: [],
       passwordModel: false,
@@ -318,7 +284,7 @@ export default {
     if (back) {
       this.parmValue = JSON.parse(back);
       console.log(this.parmValue);
-      const { page, size, start_date, end_date } = this.parmValue;
+      const { page, size, start, end } = this.parmValue;
 
       this.pageInfo = {
         size: this.pageInfo.size,
@@ -348,22 +314,13 @@ export default {
       this.searchList();
     },
     getRouter(toRouter, queryId, type) {
-      console.log(toRouter, queryId);
       if (toRouter && queryId) {
-        let model = {
-          id: queryId,
-          type
-        };
-
+        let model = { id: queryId, type };
         //有多选框的条件
         this.parmValue.select = this.select;
         this.parmValue.sselect = this.sselect;
         this.parmValue.input = this.input;
-
-        let routerModel = {
-          options: JSON.parse(JSON.stringify(this.parmValue)),
-          router: this.$route.path
-        };
+        let routerModel = { options: JSON.parse(JSON.stringify(this.parmValue)), router: this.$route.path };
         model.preModel = JSON.stringify(routerModel);
         this.routeGoto(toRouter, model);
       } else {
@@ -386,15 +343,9 @@ export default {
     },
     showal(list, message, code) {
       let htmlList = "<ul>";
-      list.forEach(v => {
-        htmlList += `<li>${code !== "" ? v[code] : v}</li>`;
-      });
+      list.forEach(v => { htmlList += `<li>${code !== "" ? v[code] : v}</li>`});
       htmlList += "</ul>";
-      this.$notify({
-        title: message,
-        dangerouslyUseHTMLString: true,
-        message: htmlList
-      });
+      this.$notify({ title: message, dangerouslyUseHTMLString: true, message: htmlList });
     },
     restSearch() {
       this.select = "1";
@@ -402,24 +353,16 @@ export default {
       this.wsm_code = [];
       this.wsm_supplierNo = [];
       this.timeOBJ = {
-        start_date: "", //起始时间
-        end_date: "" // 结束时间
+        start: "", //起始时间
+        end: "" // 结束时间
       };
       this.parmValue = {
-        filingCode: "", // 报备单编码
-        wsm_in_code: "", // 入库单号
-        cgdNo: "", // 销售订单编码
-        apply_name: "", // 申请人
+        start: "", //新建起始时间
+        end: "", // 新建结束时间
+        fillCode: "", // 报备单编码
         good_name: "", // 产品名称
-        good_code: "", // 产品属性编号
+        customerCode: [],
         status: "", //状态
-        wsm_code: "", //入货仓库编码
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
-        last_start_date: "", //最后入库时间开始
-        last_end_date: "", //最后入库时间结束
-        orderCode: "", //订单编号
-        company_name: "", //部门
         page: 1, // 页码
         size: 15 // 每页显示条数
       };
@@ -432,7 +375,7 @@ export default {
       this.searchList();
     },
     handleCustomerChange(e) {
-      this.parmValue.companyCode = e.code ? [e.code] : "";
+      this.parmValue.customerCode = e.code ? [e.code] : "";
       this.customerName = e.label;
       this.searchList();
     },
@@ -440,27 +383,22 @@ export default {
       if (this.loading) return;
 
       if (
-        (this.timeOBJ.start_date !== "" && this.timeOBJ.end_date === "") ||
-        (this.timeOBJ.start_date === "" && this.timeOBJ.end_date !== "")
+        (this.timeOBJ.start !== "" && this.timeOBJ.end === "") ||
+        (this.timeOBJ.start === "" && this.timeOBJ.end !== "")
       ) {
         this.$message.warning("时间区间不完整！");
         return;
       }
 
       this.loading = true;
-
       const res = await asyncRequest.list({
         ...this.parmValue,
         ...this.timeOBJ,
         ...this.pageInfo,
-        customerCode: this.currentCompany,
-        supplierNo: Array.isArray(this.parmValue.supplierNo)
-          ? this.parmValue.supplierNo[0]
-          : this.parmValue.supplierNo,
-        companyCode: Array.isArray(this.parmValue.companyCode)
-          ? this.parmValue.companyCode[0]
-          : this.parmValue.companyCode,
-        noRelation: true
+        noRelation: true,
+        companyNo: this.currentCompany,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo,
+        customerCode: Array.isArray(this.parmValue.customerCode) ? this.parmValue.customerCode[0] : this.parmValue.customerCode
       });
       const { code, data } = await this.useResHandle(res);
       if (code === 0) {
@@ -475,8 +413,8 @@ export default {
     },
     // 时间
     async handleTime(e) {
-      this.timeOBJ.start_date = e?.startTime ?? "";
-      this.timeOBJ.end_date = e?.endTime ?? "";
+      this.timeOBJ.start = e?.startTime ?? "";
+      this.timeOBJ.end = e?.endTime ?? "";
 
       if (e.startTime && e.endTime) {
         this.pageInfo.curr = 1;

src/views/sellOut/filing/detail.vue

@@ -36,10 +36,6 @@
               <wait-transferred :id="id" :num="num" @refresh="handleRefresh" />
             </el-collapse-item>
           </tempalte>
-
-<!--          <el-collapse-item v-if="status === '3'" name="4" title="发货单"> -->
-<!--            <shipment-request :order-code="orderCode" /> -->
-<!--          </el-collapse-item> -->
         </el-collapse>
       </el-tab-pane>
 

src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -373,6 +373,7 @@ export default {
       options: [
         { value: "0", label: "非项目" },
         { value: "1", label: "项目" },
+        { value: "2", label: "业务报备" }
       ],
       statusOptions: [
         { value: "1", label: "竞品" },

src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -120,6 +120,14 @@
         >
           <i class="el-icon-shopping-cart-2 tb-icon" @click="buy_goods(scope.row)"></i>
         </el-tooltip>
+
+        <el-tooltip 
+          v-if="is_project === '2'"
+          content="咨询转报备" 
+          placement="top"
+          >
+          <i class="el-icon-sort tb-icon" style="transform: rotate(90deg);" @click="transfer_goods(scope.row)" />
+        </el-tooltip>
       </template>
     </ex-table>
     <add-edit-bargain
@@ -128,6 +136,7 @@
       @cancel="wantBmodel = false"
       @refresh="(wantBmodel = false), $emit('resGoodOk')"
     />
+
     <buy-good-modal
       :showModel="bayGoodShowModel"
       :sitem="bayGoodItem"
@@ -135,6 +144,13 @@
       @refresh="(bayGoodShowModel = false), $emit('resGoodOk')"
     />
 
+    <transfer-goods-modal 
+      :showModel="transferGoodsShowModel"
+      :sitem="transferGoodsItem"
+      @cancel="transferGoodsShowModel = false"
+      @refresh="(transferGoodsShowModel = false), $emit('resGoodOk')"
+    />
+
     <show-goods-data-table-modal
       :showModel="visible"
       :type="'3'"
@@ -144,6 +160,7 @@
       :iscgd="true"
       @cancel="visible = false"
     />
+    
 
     <el-dialog
       title="上次议价驳回原因"
@@ -175,6 +192,7 @@ import { feedbackListCol } from "../columns";
 import { mapGetters } from "vuex";
 import addEditBargain from "./addEditBargain";
 import buyGoodModal from "./buyGoodModal";
+import TransferGoodsModal from "./transferGoodModal.vue";
 import showGoodsDataTableModal from "@/components/show-goods-data-table-modal";
 export default {
   name: "zixunOrder",
@@ -183,23 +201,18 @@ export default {
   components: {
     addEditBargain,
     buyGoodModal,
+    TransferGoodsModal,
     showGoodsDataTableModal
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      const tran =
-        this.$store.getters.btnList.find(
-          item => item.menu_route == "zixunOrderDetail"
-        ) || {};
+      const tran = this.$store.getters.btnList.find(item => item.menu_route == "zixunOrderDetail") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
     ppowers() {
-      const tran =
-        this.$store.getters.roleProcess.find(
-          item => item.process_type === "ZXD"
-        ) || {};
+      const tran = this.$store.getters.roleProcess.find(item => item.process_type === "ZXD") || {};
       const { action } = tran ?? {};
       return action ?? [];
     }
@@ -226,7 +239,9 @@ export default {
       s_input: "",
       status: "",
       bayGoodShowModel: false,
+      transferGoodsShowModel:false,
       bayGoodItem: {},
+      transferGoodsItem: {},
       is_project: false,
       customerCode: [], //客户公司code
       baoptions: [
@@ -235,7 +250,6 @@ export default {
         { id: "2", label: "待财务专员审批", type: "warning" },
         { id: "3", label: "业务主管驳回", type: "danger" },
         { id: "4", label: "待财务主管审核", type: "warning" },
-        // { id: "5", label: "专员驳回", type: "" },
         { id: "6", label: "财务主管通过", type: "success" },
         { id: "7", label: "待BOSS审批", type: "warning" },
         { id: "8", label: "财务主管驳回", type: "danger" },
@@ -306,6 +320,45 @@ export default {
   },
 
   methods: {
+    transfer_goods(row){
+      const {
+        company,
+        companyNo,
+        khname,
+        platform_name,
+        arrival_time,
+        num
+      } = this.sitem;
+
+      this.transferGoodsItem = JSON.parse(JSON.stringify(row));
+      this.transferGoodsItem.in_company = company;
+      this.transferGoodsItem.in_companyNo = companyNo;
+      this.transferGoodsItem.in_khname = khname;
+      this.transferGoodsItem.in_platform_name = platform_name;
+      this.transferGoodsItem.in_arrival_time = arrival_time;
+      this.transferGoodsItem.in_num = num;
+      this.transferGoodsShowModel = true;
+    },
+    buy_goods(row) {
+      const {
+        company,
+        companyNo,
+        khname,
+        platform_name,
+        arrival_time,
+        num
+      } = this.sitem;
+      this.bayGoodItem = JSON.parse(JSON.stringify(row));
+      this.bayGoodItem.in_company = company;
+      this.bayGoodItem.in_companyNo = companyNo;
+      this.bayGoodItem.in_khname = khname;
+      this.bayGoodItem.in_platform_name = platform_name;
+      this.bayGoodItem.in_arrival_time = arrival_time;
+      this.bayGoodItem.in_num = num;
+      this.bayGoodShowModel = true;
+
+      // console.log(row);
+    },
     show_view(row) {
       this.row = row;
       this.visible = true;
@@ -420,26 +473,6 @@ export default {
           console.log("取消");
         });
     },
-    buy_goods(row) {
-      const {
-        company,
-        companyNo,
-        khname,
-        platform_name,
-        arrival_time,
-        num
-      } = this.sitem;
-      this.bayGoodItem = JSON.parse(JSON.stringify(row));
-      this.bayGoodItem.in_company = company;
-      this.bayGoodItem.in_companyNo = companyNo;
-      this.bayGoodItem.in_khname = khname;
-      this.bayGoodItem.in_platform_name = platform_name;
-      this.bayGoodItem.in_arrival_time = arrival_time;
-      this.bayGoodItem.in_num = num;
-      this.bayGoodShowModel = true;
-
-      // console.log(row);
-    },
     // 时间选择事件
     async handleTime(e) {
       const { startTime, endTime } = e;

src/views/sellOut/zixunOrder/components/transferGoodModal.vue

@@ -0,0 +1,1020 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="'咨询单转报备'"
+    :center="true"
+    align="left"
+    top="5vh"
+    width="1040px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    append-to-body
+    @close="showModelThis = false"
+  >
+    <el-card style="margin-top: -20px">
+      <el-row>
+        <el-col :span="24">
+          <show-data-table
+            v-if="newTime !== '' && sitem"
+            style="margin: 0; padding: 0"
+            :new-time="newTime"
+            :sitem="sitem"
+            border
+            :columns="ShowDataTableColumns"
+          >
+            <template slot="good_name">
+              <span>{{ sitem.good_name }}</span>
+              <span v-for="(si, sii) in sitem.specinfo" :key="si.specid + sii">
+                <span v-if="sii !== 0">--</span>
+                <span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span>
+              </span>
+            </template>
+            <template slot="is_noble">
+              <span v-if="sitem.is_noble">
+                {{ sitem.noble_weight }}g--{{ sitem.metal_name }}--{{
+                sitem.is_diff === "1" ? "有" : "无"
+                }}工差--{{ sitem.config }}--{{ sitem.other_config }}
+              </span>
+              <span v-else>非贵金属商品</span>
+            </template>
+            <template slot="in_num">
+              <span>{{ sitem.in_num }}{{ sitem.unit }}</span>
+            </template>
+          </show-data-table>
+        </el-col>
+        <el-col :span="24" style="padding: 18px 0 0 0">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            :size="'mini'"
+            label-width="85px"
+            class="demo-ruleForm"
+          >
+            <el-row>
+              <el-col :span="5">
+                <el-form-item label="报备数量" prop="good_num">
+                  <digital-input
+                    :values="ruleForm.good_num"
+                    :placeholder="'报备数量'"
+                    :min="1"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="0"
+                    :size="'mini'"
+                    :controls="false"
+                    :disabled="false"
+                    :append="sitem.unit"
+                    @reschange="num_change($event, 'good_num')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="销售单价" prop="sale_price">
+                  <digital-input
+                    :values="ruleForm.sale_price"
+                    :placeholder="'商品单价'"
+                    :min="sitem.sale_price"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="2"
+                    :size="'mini'"
+                    :controls="false"
+                    :disabled="false"
+                    :append="'元'"
+                    @reschange="num_change($event, 'sale_price')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="11">
+                <el-form-item label="业务公司" prop="companyNo" label-width="85px">
+                  <search-work-company
+                    :value="ruleForm.companyNo"
+                    :placeholder="'业务公司'"
+                    :disabled="false"
+                    :size="'mini'"
+                    :is-detail="true"
+                    @searchChange="company_idsearchChange"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="2" style="text-align: right">
+                <el-button :size="'mini'" type="primary" :disabled="loading" @click="submitForm">保 存</el-button>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="订单备注" prop="remark" label-width="85px" style="margin-bottom:2px">
+                  <el-input v-model="ruleForm.remark" maxlength="500" placeholder="订单备注" />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="业务经理" prop="managerid" label-width="115px">
+                  <project-manager
+                    :size="'mini'"
+                    v-model.value="ruleForm.managerid"
+                    @searchChange="managerChange"
+                    style="width: 100%"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="凭证类型" prop="proof_type" label-width="85px" v-model="proof_type">
+                      <el-select
+                        v-model="ruleForm.proof_type"
+                        placeholder="凭证类型"
+                        style="width: 100%"
+                        @change="set_proof_url()"
+                      >
+                        <el-option
+                          v-for="item in proof_options"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="18">
+                    <el-form-item label="凭证文件" prop="proof_url" label-width="85px">
+                      <ul class="shangchuan-ul">
+                        <li v-if="ruleForm.proof_type + '' === '1'" class="shiping">
+                          <div v-if="video_url" class="clearfix">
+                            <el-popover placement="top" width="300" trigger="hover">
+                              <video width="275" controls class="fl">
+                                <source :src="video_url" type="video/mp4" />
+                                <source :src="video_url" type="video/avi" />您的浏览器不支持Video标签。
+                              </video>
+                              <i
+                                slot="reference"
+                                class="el-icon-video-camera-solid hover"
+                                style="font-size: 18px"
+                              />
+                            </el-popover>
+                            <el-link
+                              :underline="false"
+                              type="warning"
+                              style="margin: 0 0 0 16px"
+                              @click="deleteUrl('1')"
+                            >删除</el-link>
+                          </div>
+
+                          <div v-else class="activity-upload">
+                            <div class="btnupload" style="position: relative">
+                              <i class="el-icon-plus avatar-uploader-icon" />
+                              <video-upload
+                                class="Upload"
+                                :disabled="type === 'view' || type === 'editCoin'"
+                                :accept="'.mp4,.avi'"
+                                :multiple="false"
+                                :uploadcondition="beforeVideoUpload"
+                                @UploadErrorEvent="UploadVideoEventproof_url"
+                                @UploadSuccessEvent="UploadSuccessVideoproof_url"
+                              />
+                            </div>
+
+                            <div class="txt-tips fl">
+                              <p>建议大小：小于10MB</p>
+                              <p>文件格式：.mp4,.avi</p>
+                            </div>
+                          </div>
+                        </li>
+                        <li v-if="ruleForm.proof_type + '' === '2'" class="tupian">
+                          <div v-if="img_url" class="clearfix">
+                            <img style="width: 50px; height: 50px" :src="img_url" class="avatar fl" />
+                            <el-link
+                              :underline="false"
+                              type="warning"
+                              style="margin: 0 0 0 16px"
+                              @click="deleteUrl('2')"
+                            >删除</el-link>
+                          </div>
+
+                          <div v-else class="activity-upload">
+                            <div class="btnupload" style="position: relative">
+                              <i class="el-icon-plus avatar-uploader-icon" />
+                              <file-upload
+                                class="Upload"
+                                :disabled="type === 'view' || type === 'editCoin'"
+                                :accept="'.jpg,.png,.jpeg'"
+                                :multiple="false"
+                                :uploadcondition="beforeAvatarUpload"
+                                @UploadErrorEvent="UploadErrorEventproof_url"
+                                @UploadSuccessEvent="UploadSuccessEventproof_url"
+                              />
+                            </div>
+                            <div class="txt-tips fl">
+                              <p>建议大小：小于1MB</p>
+                              <p>文件格式：.jpg,.png,.jpeg</p>
+                            </div>
+                          </div>
+                        </li>
+                        <li v-if="ruleForm.proof_type + '' === '3'" class="qita">
+                          <div v-if="other_url" class="clearfix">
+                            <a :href="other_url" download="凭证文件">点击下载</a>
+
+                            <el-link
+                              :underline="false"
+                              type="warning"
+                              style="margin: 0 0 0 16px"
+                              @click="deleteUrl('3')"
+                            >删除</el-link>
+                          </div>
+
+                          <div v-else class="activity-upload">
+                            <div class="btnupload" style="position: relative">
+                              <i class="el-icon-plus avatar-uploader-icon" />
+                              <file-upload-pdf
+                                class="Upload"
+                                :accept="'.xlsx,.xls,.pdf,.zip,.rar,.7z'"
+                                :multiple="false"
+                                :uploadcondition="beforeOtherUpload"
+                                @UploadErrorEvent="UploadErrorOtherproof_url"
+                                @UploadSuccessEvent="UploadSuccessOtherproof_url"
+                              />
+                            </div>
+                            <div class="txt-tips fl">
+                              <p>建议大小：小于5MB</p>
+                              <p>文件格式：.xlsx,.xls,.pdf,.zip,.rar,.7z</p>
+                            </div>
+                          </div>
+                        </li>
+                      </ul>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-col>
+              <el-col :span="12"></el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="24">
+          <in-addr-model
+            :show-model="addrmodel"
+            @cancel="addrmodel = false"
+            @refresh="addrRefresh"
+          />
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/zixunOrder";
+import SearchStockGoodModal from "@/components/search-stock-good-modal";
+import {
+  isnumber,
+  isMobile,
+  isChinese,
+  isEmoticon,
+  isSpecialSymbol,
+  hasSpace,
+  isAddr
+} from "@/utils/validate";
+import inAddrModel from "@/components/in-addr-model";
+import { ShowDataTableColumns } from "./ShowDataTableColumns";
+import { replaceTextWrapAndSpace } from "@/utils";
+export default {
+  name: "BuyGoodModal",
+  components: { SearchStockGoodModal, inAddrModel },
+  mixins: [resToken],
+  props: ["showModel", "sitem"],
+  data() {
+    const validatemobile = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("手机号不能为空！"));
+      } else {
+        if (!isMobile(value)) {
+          callback(new Error("手机号格式不正确！"));
+        } else {
+          callback();
+        }
+      }
+    };
+    const validateWeight = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("收货总数不能为空!"));
+      } else {
+        if (!isnumber(value)) {
+          callback(new Error("收货总数仅支持整数!"));
+        } else {
+          callback();
+        }
+      }
+    };
+    const validate_num_0 = (rule, value, callback) => {
+      const { required } = rule;
+      if (required && value === "") {
+        callback(new Error("不能为空！"));
+      } else if (
+        required &&
+        (value === "0" ||
+          value === "0." ||
+          value === "0.0" ||
+          value === "0.00" ||
+          value === "0.000")
+      ) {
+        // new Error('不能为零！')
+        callback();
+      } else {
+        callback();
+      }
+    };
+    const validatecontactor = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("联系人不能为空！"));
+      } else {
+        if (value.length < 2 || value.length > 10) {
+          callback(new Error("联系人规则为2~10位汉字！"));
+        } else {
+          if (!isChinese(value)) {
+            callback(new Error("联系人规则为2~10位汉字！"));
+          } else if (isEmoticon(value)) {
+            callback(new Error("联系人规则为2~10位汉字！"));
+          } else {
+            callback();
+          }
+        }
+      }
+    };
+    const validateAddr = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("详细地址不能为空！"));
+      } else {
+        if (hasSpace(value)) {
+          callback(new Error("不能出现/回车/换行符！"));
+        } else if (isSpecialSymbol(value)) {
+          callback(new Error("不能使用英文特殊字符！"));
+        } else if (isAddr(value)) {
+          callback();
+        } else {
+          callback(new Error("详细地址填写不规范！"));
+        }
+      }
+    };
+    return {
+      loading: false,
+      total_price: "0",
+      addrmodel: false,
+      showModelThis: this.showModel,
+      showGoodsModel: false,
+      ShowDataTableColumns: ShowDataTableColumns,
+      video_url: "",
+      img_url: "",
+      other_url: "",
+      goodTypes: [
+        { value: "1", label: "常规商品" },
+        { value: "2", label: "赠品" },
+        { value: "3", label: "样品" }
+      ],
+      proof_options: [
+        {
+          value: "1",
+          label: "视频"
+        },
+        {
+          value: "2",
+          label: "图片"
+        },
+        {
+          value: "3",
+          label: "其他"
+        }
+      ],
+      pickerOptions: {
+        disabledDate: time => {
+          return (
+            time.getTime() < new Date(this.sitem.in_arrival_time).getTime()
+          );
+        }
+      },
+
+      options: [
+        {
+          value: "1",
+          label: "有地址下单"
+        },
+        {
+          value: "2",
+          label: "无地址下单"
+        }
+      ],
+      stock_code: "",
+      cat_id: "",
+      ruleForm: {
+        managerid: [],
+        manager: "",
+        bidNo: "", // 竞价单反馈编号
+        good_num: "", // 商品数量
+        sale_price: "",
+        sendtype: "1", // 发货方式
+        arrtime: "", // 到货时间
+        remark: "", // 订单备注
+        platform_order: "", // 平台订单号
+        workNo: "", // 其他单号
+        companyNo: "",
+      },
+      manager_name: "",
+      rulesThis: this.rules,
+      rules: {
+        goodtype: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择商品类型"
+          }
+        ],
+        good_num: [
+          {
+            required: true,
+            validator: validate_num_0,
+            trigger: "blur"
+          }
+        ],
+        sale_price: [
+          {
+            required: true,
+            validator: validate_num_0,
+            trigger: "blur"
+          }
+        ],
+        managerid: [
+          {
+            required: true,
+            message: "请选择业务经理",
+            trigger: "change"
+          }
+        ],
+        companyNo: [
+          {
+            required: true,
+            message: "请选择业务公司",
+            trigger: "change"
+          }
+        ],
+        sendtype: [
+          {
+            required: true,
+            message: "请选择发货方式",
+            trigger: "change"
+          }
+        ],
+        remark: [
+          {
+            required: true,
+            message: "输入订单备注",
+            trigger: "blur"
+          }
+        ],
+        arrtime: [
+          {
+            required: true,
+            message: "要求到货时间",
+            trigger: "change"
+          }
+        ],
+        proof_type: [
+          {
+            required: true,
+            message: "请选择凭证类型",
+            trigger: "change"
+          }
+        ],
+        proof_url: [
+          {
+            required: true,
+            message: "请上传凭证文件",
+            trigger: "blur,change"
+          }
+        ]
+      },
+      addrForm: {
+        order_addr: [] // 收货地址
+      },
+      addrRules: {
+        receipt_quantity: [
+          {
+            required: true,
+            validator: validateWeight,
+            trigger: "blur"
+          }
+        ],
+
+        contactor: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validatecontactor
+          }
+        ],
+        mobile: [
+          {
+            required: true,
+            validator: validatemobile,
+            trigger: "blur"
+          }
+        ],
+
+        addr_code: [
+          {
+            type: "array",
+            required: false,
+            trigger: "change"
+          }
+        ],
+        addr: [
+          {
+            required: true,
+            validator: validateAddr,
+            trigger: "blur"
+          }
+        ]
+      },
+
+      id: ""
+    };
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val;
+      if (val) {
+        // this.rulesThis = this.rules;
+        this.initForm();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+    "ruleForm.sale_price"(val) {
+      this.ruleForm.goodtype = Number(val) === 0 ? "2" : "1";
+    }
+  },
+  methods: {
+    managerChange(e) {
+      const { id, label } = e;
+      this.ruleForm.manager = label;
+      this.ruleForm.managerid = id ? [id] : []
+
+      console.log(this.ruleForm)
+      this.$refs.ruleForm.validateField("managerid");
+      // this.manager_name = label ?? "";
+    },
+    // 修改日期校验
+    mdDate() {
+      // 用户传递的到货时间不能大于要求到货的时间  对要求到货时间进行字符截取10位抹除时分秒
+      if (
+        Date.parse(this.ruleForm.arrtime) <
+        Date.parse(this.sitem.in_arrival_time.substring(0, 10))
+      ) {
+        this.$message.warning("到货时间不能小于要求到货日期");
+        this.ruleForm.arrtime = "";
+      }
+    },
+
+    // 销售方公司选择
+    company_idsearchChange(e) {
+      const { code } = e;
+      this.ruleForm.companyNo = code || "";
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("companyNo");
+    },
+
+    closeModel() {
+      console.log("closeModel!!");
+      this.showModelThis = false;
+    },
+    num_change(e, key) {
+      this.ruleForm[key] = e + "";
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField(key);
+      this.set_total_price();
+    },
+    set_total_price() {
+      const { good_num, sale_price } = this.ruleForm;
+      const num = good_num * 1;
+      const price = sale_price * 1;
+      this.total_price = num * price + "";
+    },
+    async initForm() {
+      this.loading = true;
+      this.rulesThis = this.rules;
+
+      console.log(this.rulesThis)
+      const { can } = this.sitem;
+      this.sitem.can_name = "";
+      this.sitem.is_noble = false;
+      if (can && can.length > 0) {
+        can.forEach((a, ai) => {
+          this.sitem.is_noble = a.id + "" === "6";
+          this.sitem.can_name += `${ai !== 0 ? "_" : ""}${a.name}`;
+        });
+      }
+      await this.resetForm();
+      this.getNewTime();
+      this.set_total_price();
+      this.loading = false;
+    },
+    addrRefresh(e) {
+      const list = JSON.parse(JSON.stringify(e.list));
+      list.forEach(item => {
+        item.label = [item.label];
+        item.code = [item.areaCode];
+      });
+      this.addrForm.order_addr.push(...list);
+    },
+
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          const {
+            bidNo,
+            in_num,
+            in_arrival_time,
+            sale_price,
+            in_companyNo
+          } = this.sitem;
+   
+          this.ruleForm = {
+            bidNo: bidNo || "", // 竞价单反馈编号
+            good_num: in_num || "0", // 商品数量
+            sale_price: sale_price || "",
+            sendtype: "1", // 发货方式
+            arrtime: in_arrival_time || "", // 到货时间
+            remark: "",
+            proof_type: "1", // 通过or驳回
+            proof_url: "", // 驳回至
+            companyNo: in_companyNo || "",
+            goodtype: Number(sale_price) === 0 ? "2" : "1",
+            managerid: [],
+            manager: ""
+          };
+        }
+
+        if (this.$refs.addrForm) {
+          this.$refs.addrForm.resetFields();
+          this.$refs.addrForm.clearValidate();
+          this.addrForm = {
+            order_addr: []
+          };
+        }
+      });
+    },
+    openHouseModal(index) {
+      const findex = this.addrForm.order_addr.findIndex(v => v.edit === true);
+      if (findex !== -1) {
+        this.$message.warning("当前已有地址在编辑，请保存后再试！");
+        return;
+      } else {
+        if (index === -1) {
+          this.addrForm.order_addr.push({
+            edit: true,
+            receipt_quantity: "",
+            contactor: "",
+            mobile: "",
+            addr_code: [],
+            addr: "",
+            code: [],
+            label: []
+          });
+        } else {
+          this.addrForm.order_addr[index].edit = true;
+        }
+      }
+    },
+    async areaChange(e, index) {
+      const { code, area_code, label, splitLabel } = e;
+      // this.addrForm.order_addr[index] = e
+      this.addrForm.order_addr[index].addr_code_name = splitLabel
+        ? splitLabel.split(",").join("/")
+        : "";
+      this.addrForm.order_addr[index].addr_code = code ? code.split(",") : [];
+      this.addrForm.order_addr[index].code = area_code ? [area_code] : [];
+      this.addrForm.order_addr[index].label = label ? [label] : [];
+    },
+    // 省市区选择
+    // async select_area_change(e, index) {
+    //   this.addrForm.order_addr[index].addr_code = e
+    //   const { addr_code } = this.addrForm.order_addr[index]
+    //   if (addr_code && addr_code.length === 3) {
+    //     const arrCode = addr_code[addr_code.length - 1]
+    //     // console.log(model);
+    //     const { code, data, message } = await asyncRequest.addrall({
+    //       code: arrCode
+    //     })
+    //     if (code === 0) {
+    //       const { province, city, area } = data
+    //       const province_name = province && province.name ? province.name : ''
+    //       const city_name = city && city.name ? city.name : ''
+    //       const area_name = area && area.name ? area.name : ''
+    //       this.addrForm.order_addr[index].addr_code_name =
+    //         province_name && city_name && area_name
+    //           ? `${province_name}/${city_name}/${area_name}`
+    //           : ''
+    //     } else if (code >= 100 && code <= 104) {
+    //       await this.logout()
+    //     } else {
+    //       this.$message.warning(message)
+    //     }
+    //   } else {
+    //     this.addrForm.order_addr[index].addr_code_name = ''
+    //   }
+    // },
+    // 省市区保存某一行
+    checkRow(rowIndex) {
+      this.$refs.addrForm.validate(valid => {
+        if (valid) {
+          this.addrForm.order_addr[rowIndex].edit = false;
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    // 省市区删除行操作
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async valid => {
+        if (valid) {
+          if (this.loading) return;
+          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm));
+       
+          model.manager = model.manager.toString();
+
+          const { remark, bidNo, sale_price, manager, managerid, good_num , proof_type, proof_url} = model;
+
+          const res = await asyncRequest.transferFilling({
+            remark, bidNo, sale_price, manager, managerid, good_num , proof_type, proof_url,
+            managerid:Array.isArray(managerid) ? managerid[0] : managerid
+          });
+
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "转单成功！",
+              message: ""
+            });
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+            this.loading = false;
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            this.loading = false;
+            await this.logout();
+          } else {
+            this.loading = false;
+            this.$message.warning(res.message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    // 图片上传成功
+    async UploadSuccessEventproof_url(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.img_url = url;
+        this.set_proof_url();
+        this.$message.success("图片上传成功!");
+      }
+    },
+
+    // 图片上传失败
+    UploadErrorEventproof_url(res) {
+      if (res !== "break") {
+        this.set_proof_url();
+        this.$message.error("图片上传失败!");
+      }
+    },
+
+    // 判断图片规格
+    beforeAvatarUpload(file) {
+      let isJPG = false;
+      if (
+        file.type === "image/jpg" ||
+        file.type === "image/png" ||
+        file.type === "image/jpeg"
+      ) {
+        isJPG = true;
+      }
+      const isLt2M = file.size / 1024 / 1024 < 1;
+      if (!isJPG) {
+        this.$message.error("图片格式不正确！");
+      }
+      if (!isLt2M) {
+        this.$message.error("图片大小不能超过 1MB!");
+      }
+      return isJPG && isLt2M;
+    },
+
+    // 视频上传成功
+    async UploadSuccessVideoproof_url(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.video_url = url;
+        this.set_proof_url();
+        this.$message.success("视频上传成功!");
+      }
+    },
+
+    // 视频上传失败
+    UploadErrorVideoproof_url(res) {
+      if (res !== "break") {
+        this.set_proof_url();
+        this.$message.error("视频上传失败!");
+      }
+    },
+
+    // 判断视频规格
+    beforeVideoUpload(file) {
+      let isJPG = false;
+      if (file.type === "video/mp4" || file.type === "video/avi") {
+        isJPG = true;
+      }
+      const isLt2M = file.size / 1024 / 1024 < 10;
+      if (!isJPG) {
+        this.$message.error("视频格式不正确！");
+      }
+      if (!isLt2M) {
+        this.$message.error("视频大小不能超过 10MB!");
+      }
+      return isJPG && isLt2M;
+    },
+
+    // 其他文件上传成功
+    async UploadSuccessOtherproof_url(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.other_url = url;
+        this.set_proof_url();
+        this.$message.success("文件成功!");
+      }
+    },
+
+    // 其他文件上传失败
+    UploadErrorOtherproof_url(res) {
+      if (res !== "break") {
+        this.set_proof_url();
+        this.$message.error("文件上传失败!");
+      }
+    },
+
+    // 判断其他文件规格
+    beforeOtherUpload(file) {
+      console.log(file);
+      let isJPG = false;
+      if (
+        file.type === "application/vnd.ms-excel" ||
+        file.type ===
+          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ||
+        file.type === "application/pdf" ||
+        file.type === "application/x-zip-compressed"
+      ) {
+        isJPG = true;
+      }
+      const name = file.name;
+      const list = name.split(".");
+      if (list[list.length - 1] === "rar" || list[list.length - 1] === "7z") {
+        isJPG = true;
+      }
+
+      const isLt2M = file.size / 1024 / 1024 < 5;
+      if (!isJPG) {
+        this.$message.error("文件格式不正确！");
+      }
+      if (!isLt2M) {
+        this.$message.error("文件大小不能超过 5MB!");
+      }
+      return isJPG && isLt2M;
+    },
+
+    deleteUrl(type) {
+      switch (type) {
+        case "1":
+          this.video_url = "";
+          break;
+        case "2":
+          this.img_url = "";
+          break;
+        case "3":
+          this.other_url = "";
+          break;
+        default:
+          this.video_url = "";
+      }
+      this.set_proof_url();
+    },
+    set_proof_url() {
+      const { proof_type } = this.ruleForm;
+      switch (proof_type) {
+        case "1":
+          this.ruleForm.proof_url = this.video_url;
+          break;
+        case "2":
+          this.ruleForm.proof_url = this.img_url;
+          break;
+        case "3":
+          this.ruleForm.proof_url = this.other_url;
+          break;
+        default:
+          this.ruleForm.proof_url = this.video_url;
+      }
+      this.$refs.ruleForm.validateField("proof_url");
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+// .capitalClaim {
+.excelUploadBox {
+  position: relative;
+  width: 100%;
+  height: 120px;
+  line-height: 120px;
+  box-sizing: border-box;
+  &:hover {
+    cursor: pointer;
+  }
+  .el-icon-receiving {
+    width: 100%;
+    text-align: center;
+    height: 50px;
+    display: block;
+    font-size: 32px;
+    line-height: 90px;
+    color: #d3d4d6;
+  }
+  .boxM {
+    width: 100%;
+    display: block;
+    text-align: center;
+    line-height: 65px;
+    height: 60px;
+    color: #909399;
+  }
+}
+.excelUpload {
+  top: 0;
+  left: 0;
+  position: absolute;
+  z-index: 2;
+  width: 100%;
+  height: 120px;
+  line-height: 120px;
+  box-sizing: border-box;
+}
+.excelUploadRes {
+  width: 100%;
+  height: 120px;
+  line-height: 120px;
+  box-sizing: border-box;
+  i {
+    width: 55px;
+    height: 120px;
+    line-height: 120px;
+    text-align: center;
+    font-size: 20px;
+    &.fl {
+      padding-left: 16px;
+    }
+    &.fr {
+      padding-right: 16px;
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+  span {
+    width: 386px;
+    line-height: 16px;
+    margin: 52px 0 0 0;
+    font-size: 16px;
+  }
+}
+// }
+</style>

src/views/sellOut/zixunOrder/detail.vue

@@ -79,18 +79,6 @@
             @resGoodOk="initForm()"
           />
         </el-tab-pane>
-        <!-- <el-tab-pane label="审批记录" name="3" v-if="queryType == 'view'">
-          <process-time-line
-            v-if="newTime !== ''"
-            :newTime="newTime"
-            :type="'ZXD'"
-            :orderCode="queryId"
-          />
-        </el-tab-pane> -->
-
-        <!-- <el-tab-pane label="流程图" name="3" v-if="queryType == 'view'">
-          <flow-chart process_id="24" type="ZXD" :orderCode="queryId" />
-       </el-tab-pane> -->
       </el-tabs>
     </div>
     <div v-else>
@@ -113,7 +101,7 @@ export default {
   components: {
     addForm,
     editForm,
-    feedbackList,
+    feedbackList
   },
 
   computed: {

src/views/sellOut/zixunOrder/index.vue

@@ -172,11 +172,12 @@
                 ? "非项目竞价单"
                 : String(scope.row.is_project) === "1"
                 ? "项目竞价单"
+                : String(scope.row.is_project) === "2"
+                ? "业务报备"
                 : "--"
             }}</el-tag
           >
         </template>
-
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((i) => i == '007')"