暂存

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

@@ -10,6 +10,7 @@ export default {
   list: (data, params) => http(api + "afterlist", data, "post", params),
   // 分页查询项目列表
   plist: (data, params) => http(api + "projectlist", data, "post", params),
+  
   // 详情
   detail: (data, params) => http(api + "afterinfo", data, "post", params),
   // 更新

src/components/globalComponents/search-supplier/main.vue

@@ -110,7 +110,6 @@ export default {
           code: "",
           is_platform: this.type ? this.type : "",
         };
-
         let res = await asyncRequest.list(formValue);
         if (res && res.code === 0 && res.data) {
           const { list } = res.data;

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

@@ -0,0 +1,280 @@
+export default [
+  {
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+  },
+
+  {
+    prop: "speclist",
+    label: "规格",
+    _slot_: "speclist",
+  },
+  {
+    prop: "supplierName",
+    label: "供应商名称",
+  },
+  {
+    prop: "company",
+    label: "业务企业名称",
+  },
+  {
+    prop: "good_info_img",
+    _slot_: "good_info_img",
+    label: "详情图",
+  },
+  {
+    prop: "online_reason",
+    label: "上线原因",
+  },
+  {
+    prop: "spuCode",
+    label: "商品编号",
+    span: 8,
+  },
+
+
+  {
+    prop: "creater",
+    label: "申请人",
+    span: 8,
+  },
+  {
+    prop: "platform_name",
+    label: "上线平台",
+    span: 8,
+  },
+  {
+    prop: "platform_name",
+    label: "平台商品编码",
+    span: 8,
+  },
+  {
+    prop: "online_time",
+    label: "上线时间",
+    span: 8,
+  },
+  {
+    prop: "cat",
+    label: "分类",
+    span: 8,
+  },
+  {
+    prop: "online_remark",
+    label: "上线备注",
+    span: 24,
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    span: 8,
+  },
+  {
+    prop: "unit",
+    label: "单位",
+    span: 8,
+  },
+
+  {
+    prop: "is_auth",
+    label: "供应商权限",
+    _slot_: "is_auth",
+    span: 8,
+  },
+  {
+    prop: "exclusive",
+    label: "专属类型",
+    // _slot_: "exclusive",
+    span: 8,
+  },
+  {
+    prop: "weight",
+    label: "商品总克重",
+    span: 8,
+  },
+  {
+    prop: "is_stock",
+    label: "是否库存品",
+    _slot_: "is_stock",
+    span: 8,
+  },
+  {
+    prop: "tax",
+    label: "税点",
+    span: 8,
+  },
+  {
+    prop: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    span: 8,
+  },
+
+  {
+    prop: "packing_list",
+    label: "包装清单",
+    span: 8,
+  },
+  {
+    prop: "packing_way",
+    label: "包装方式",
+    span: 8,
+  },
+  {
+    prop: "packing_spec",
+    label: "装箱规格",
+    span: 8,
+  },
+  {
+    prop: "packing_weight",
+    label: "装箱重量(g)",
+    span: 8,
+  },
+  {
+    prop: "packing_size",
+    label: "装箱尺寸",
+    span: 8,
+  },
+  {
+    prop: "good_bar",
+    label: "商品条形码",
+    span: 8,
+  },
+  {
+    prop: "supply_area",
+    label: "供货区域",
+    _slot_: "supply_area",
+    span: 8,
+  },
+  {
+    prop: "delivery_place_cn",
+    label: "发货地",
+    span: 8,
+  },
+  {
+    prop: "origin_place_cn",
+    label: "产地",
+    span: 8,
+  },
+  {
+    prop: "delivery_day",
+    label: "物流时间(天)",
+    span: 8,
+  },
+  {
+    prop: "lead_time",
+    label: "供货周期(天)",
+    span: 8,
+  },
+  {
+    prop: "sample_day",
+    label: "调样周期(天)",
+    span: 8,
+  },
+
+
+  {
+    prop: "cert_fee",
+    label: "证书费(元)",
+    span: 8,
+  },
+  {
+    prop: "packing_fee",
+    label: "包装费(元)",
+    span: 8,
+  },
+  {
+    prop: "cost_fee",
+    label: "成本工艺费(元)",
+    span: 8,
+  },
+
+  {
+    prop: "mark_fee",
+    label: "加标费(元)",
+    span: 8,
+  },
+  {
+    prop: "demo_fee",
+    label: "打样费(元)",
+    span: 8,
+  },
+  {
+    prop: "open_fee",
+    label: "开模费(元)",
+    span: 8,
+  },
+
+  {
+    prop: "sample_fee",
+    label: "调样费(元)",
+    span: 8,
+  },
+  {
+    prop: "market_price",
+    label: "市场价(元)",
+    span: 8,
+  },
+  {
+    prop: "nake_price",
+    label: "含税成本合计",
+    span: 8,
+  },
+  {
+    prop: "is_step",
+    label: "启用阶梯",
+    _slot_: "is_step",
+    span: 8,
+  },
+  {
+    prop: "exam_status",
+    label: "状态",
+    _slot_: "exam_status",
+    span: 8,
+  },
+  {
+    prop: "updatetime",
+    label: "更新时间",
+    span: 8,
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 8,
+  },
+
+
+  {
+    prop: "after_sales",
+    label: "售后说明",
+    span: 24,
+  },
+  {
+    prop: "good_remark",
+    label: "商品备注",
+    span: 24,
+  },
+
+  {
+    prop: "craft_desc",
+    label: "工艺说明",
+    span: 24,
+  },
+
+  {
+    prop: "nakelist",
+    label: "采购起订量",
+    _slot_: "nakelist",
+    span: 24,
+  },
+
+  {
+    prop: "ladderlist",
+    label: "销售起订量",
+    _slot_: "ladderlist",
+    span: 24,
+  },
+
+
+]
+

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

@@ -8,11 +8,10 @@
     :rules="rulesThis"
     label-width="110px"
     style="width: 100%"
-    class="demo-ruleForm"
   >
     <el-row>
       <el-col :span="12">
-        <el-form-item label="销售方" prop="companyNo">
+        <el-form-item label="销售方" prop="companyNo" class="clear">
           <search-work-company
             :value="ruleForm.companyNo"
             :placeholder="'销售方公司'"
@@ -24,7 +23,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="购买方公司" prop="khNo">
+        <el-form-item label="购买方公司" prop="khNo" class="clear">
           <search-customer
             :value="ruleForm.khNo"
             :names="ruleForm.customer_name"
@@ -37,7 +36,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="所属平台" prop="platform_code">
+        <el-form-item label="所属平台" prop="platform_code" class="clear">
           <search-terrace
             :value="ruleForm.platform_code"
             :disabled="type === 'view'"
@@ -50,7 +49,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="咨询截止时间" prop="endtime">
+        <el-form-item label="咨询截止时间" prop="endtime" class="clear">
           <el-date-picker
             v-model="ruleForm.endtime"
             type="datetime"
@@ -63,7 +62,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="咨询类型" prop="is_project">
+        <el-form-item label="咨询类型" prop="is_project" class="clear">
           <el-select
             v-model="ruleForm.is_project"
             style="width: 100%"
@@ -81,7 +80,7 @@
       </el-col>
 
       <el-col :span="16" v-if="ruleForm.is_project === '1'">
-        <el-form-item label="项目名称" prop="projectNo">
+        <el-form-item label="项目名称" prop="projectNo" class="clear">
           <el-select
             v-model="ruleForm.projectNo"
             multiple
@@ -98,9 +97,9 @@
           >
             <el-option
               v-for="(item, index) in poptions"
-              :key="item.id + index"
-              :label="item.name"
-              :value="item.code + ''"
+              :key="item.projectNo + index"
+              :label="item.project_name"
+              :value="item.projectNo + ''"
               :disabled="item.status !== '1'"
             >
             </el-option>
@@ -108,7 +107,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="8" v-if="ruleForm.is_project === '1'">
-        <el-form-item label="项目总预算" prop="anomalous_remark">
+        <el-form-item label="项目总预算" prop="anomalous_remark" class="clear" required>
           <el-input
             placeholder="项目总预算"
             v-model="ruleForm.anomalous_remark"
@@ -117,7 +116,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24" v-if="ruleForm.is_project === '1'">
-        <el-form-item label="项目用途" prop="anomalous_remark">
+        <el-form-item label="项目用途" prop="anomalous_remark" class="clear" required>
           <el-input
             placeholder="项目用途"
             v-model="ruleForm.anomalous_remark"
@@ -126,7 +125,228 @@
           />
         </el-form-item>
       </el-col>
+      <el-co :span="24">
+        <el-form-item
+          label="商品信息"
+          :label-position="'top'"
+          prop="ladder"
+          class="clear"
+        >
+          <el-table
+            :data="ruleForm.ladder"
+            stripe
+            border
+            :size="'mini'"
+            style="width: 100%"
+          >
+            <el-table-column type="expand">
+              <template slot-scope="props">
+                <show-data-table
+                  :sitem="props.row"
+                  :columns="ShowDataTableColumns"
+                >
+                  <template slot="good_name">
+                    <div>{{ sitem.good_name }}</div>
+                  </template>
+                  <template slot="speclist">
+                    <span
+                      v-for="(si, i) in sitem.speclist"
+                      :key="si.spec_id + i"
+                    >
+                      <span v-if="i !== 0">-</span
+                      ><span>{{ si.spec_value }}</span>
+                    </span>
+                  </template>
+
+                  <!-- <template slot="is_auth">
+                    <el-tag
+                      :size="'mini'"
+                      v-text="
+                        (
+                          options3.find((item) => item.id == sitem.is_auth) ||
+                          {}
+                        ).name || '--'
+                      "
+                    />
+                  </template> -->
+                </show-data-table>
+
+                <!-- <el-form label-position="left" inline >
+                  <el-row>
+                    <el-col :span="4">
+                      <el-form-item label="型号">
+                        <span>{{ props.row.model }}</span>
+                      </el-form-item></el-col
+                    >
+                    <el-col :span="4">
+                      <el-form-item label="颜色">
+                        <span>{{ props.row.color }}</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="材质">
+                        <span>{{ props.row.material }}</span>
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="4">
+                      <el-form-item label="贵金属种类">
+                        <span>{{ props.row.metal_id }}</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="克重规格">
+                        <span>{{ props.row.metal_id }}</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="当前贵金属单价">
+                        <span>{{ props.row.metal_id }}元/g</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="配置要求">
+                        <span>{{ props.row.config }}</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="其他配置要求">
+                        <span>{{ props.row.config }}</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="工艺说明">
+                        <span>{{ props.row.config }}</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="产品用途">
+                        <span>{{ props.row.config }}</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="咨询备注">
+                        <span>{{ props.row.config }}</span>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form> -->
+              </template>
+            </el-table-column>
+                <el-table-column
+              prop="arrival_time"
+              label="到货时间"
+              width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="budget_price"
+              label="预算单价"
+              show-overflow-tooltip
+              width="110"
+            />
+            <el-table-column
+              prop="num"
+              label="购买数量"
+              show-overflow-tooltip
+              width="110"
+            />
+            <el-table-column
+              prop="good_name"
+              label="商品名称"
+              show-overflow-tooltip
+              width="170"
+            />
+            <el-table-column
+              prop="good_img"
+              label="商品图片"
+              width="70"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <img
+                  v-viewer
+                  style="width: 26px; height: 26px; margin: 5px 5px 0 0"
+                  class="fl"
+                  v-if="scope.row.good_img"
+                  :src="scope.row.good_img"
+                  alt=""
+                />
+              </template>
+            </el-table-column>
+          
+            <el-table-column
+              prop="unit"
+              label="商品单位"
+              width="100"
+              v-if="!(status === '' || status === '0')"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="cost_price"
+              label="商品品牌"
+              width="100"
+              v-if="!(status === '' || status === '0')"
+              show-overflow-tooltip
+            />
+        
 
+            <el-table-column
+              prop="activity_price"
+              label="是否多地"
+              width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="activity_price"
+              label="是否定制"
+              width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column fixed="right" width="80">
+              <template slot="header" slot-scope="scope">
+                <span>操作</span>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  v-if="status === ''"
+                  content="添加活动商品"
+                  placement="top"
+                >
+                  <i
+                    class="el-icon-circle-plus-outline fr"
+                    style="font-size: 18px; margin-top: 2px"
+                    @click="openEdit('add', '0')"
+                  />
+                </el-tooltip>
+              </template>
+              <template slot-scope="scope">
+                <el-tooltip
+                  effect="dark"
+                  content="查看商品信息"
+                  placement="top"
+                >
+                  <i
+                    class="el-icon-view tb-icon"
+                    @click="showGoodModelFun(scope.row.skuCode)"
+                  ></i>
+                </el-tooltip>
+                <el-tooltip
+                  v-if="status === ''"
+                  effect="dark"
+                  content="删除"
+                  placement="top"
+                >
+                  <i
+                    class="el-icon-delete tb-icon"
+                    @click="openCostEditDelete(scope.$index)"
+                  ></i>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </el-co>
       <el-col :span="24" style="text-align: right" v-if="id === 'add'">
         <el-button type="primary" @click="submitForm" :size="'mini'"
           >保 存</el-button
@@ -136,8 +356,9 @@
   </el-form>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
+import asyncRequest from "@/apis/service/sellOut/zixunOrder";
 import resToken from "@/mixins/resToken";
+import ShowDataTableColumns from "./ShowDataTableColumns";
 export default {
   name: "handover",
   props: ["id", "sitem", "newTime"],
@@ -148,6 +369,8 @@ export default {
         { value: "0", label: "非项目" },
         { value: "1", label: "项目" },
       ],
+      ShowDataTableColumns: ShowDataTableColumns,
+      configOptions: ["证书", "包装盒", "绒布袋", "标签", "其他"],
       poptions: [],
       loading: false,
       selectLoading: false,
@@ -207,7 +430,14 @@ export default {
             trigger: "change",
           },
         ],
-
+        projectNo: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择项目",
+            trigger: "change",
+          },
+        ],
         ladder: [
           {
             type: "array",