暂存

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

@@ -3,7 +3,7 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 添加
-  add: (data, params) => http(api + "add", data, "post", params),
+  add: (data, params) => http(api + "salecreate", data, "post", params),
   // 删除
   delete: (data, params) => http(api + "delete", data, "post", params),
   // 分页查询
@@ -14,5 +14,7 @@ export default {
   update: (data, params) => http(api + "update", data, "post", params),
   // 修改状态
   status: (data, params) => http(api + "accountstatus", data, "post", params),
+  //验证售价
+  salegetprice: (data, params) => http(api + "salegetprice", data, "post", params),
 };
    

src/components/globalComponents/show-data-table/main.vue

@@ -102,10 +102,10 @@ export default {
       .name {
         width: calc(100% - 100px);
         text-align: left;
-        line-height: 35px;
+        line-height: 23px;
         font-size: 12px !important;
         border-bottom: 1px solid #ebeef5 !important;
-        padding: 0 0 0 10px !important;
+        padding: 6px 0 6px 10px !important;
         word-break: break-all !important;
         color: #606266 !important;
       }

src/components/search-good-online-modal/main.vue

@@ -182,7 +182,7 @@ export default {
       loading: true,
       showModelThis: false,
       parmValue: {
-        platform_code: [],
+        platform_code: "",
         companyNo: "",
         is_stock: "",
         exam_status: "",
@@ -237,9 +237,9 @@ export default {
       const { platform_code, company_id, is_stock } = this.sitem;
 
       this.parmValue = {
-        platform_code: this.active ? platform_code : [],
-        companyNo: this.active ? company_id : "",
-        is_stock: this.active ? is_stock : "",
+        platform_code: platform_code || "",
+        companyNo: company_id || "",//业务企业编号
+        is_stock: is_stock || "",
         cat_id: [], // 商品属性code
         brandid: [],
         exam_status: this.active ? "6" : "",

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -10,7 +10,75 @@
     :size="'mini'"
   >
     <el-row>
-      <el-col :span="24"
+  
+      <el-col :span="24">
+        <el-table
+          :data="ruleForm.good_ladder"
+          :size="'mini'"
+          border
+          stripe
+          style="width: 100%; margin: 0 0 20px 0"
+        >
+          <el-table-column prop="min_num" label="起订量(>=)" />
+          <el-table-column prop="sale_price" label="售价" />
+          <el-table-column prop="market_price" label="市场价" />
+          <el-table-column prop="market_platform" label="对比平台" />
+          <el-table-column prop="status" label="状态">
+            <template slot-scope="scope">
+              <el-tag
+                :size="'mini'"
+                :type="scope.row.status == '1' ? '' : 'warning'"
+                >{{ scope.row.status == "1" ? "启用" : "禁用" }}</el-tag
+              >
+            </template>
+          </el-table-column>
+          <el-table-column fixed="right">
+            <template slot="header" slot-scope="scope">
+              <span>操作</span>
+              <el-tooltip effect="dark" content="添加阶梯" placement="top">
+                <i
+                  class="el-icon-circle-plus-outline tb-icon fr"
+                  @click="openCostEdit(-1, {})"
+                ></i>
+              </el-tooltip>
+            </template>
+            <template slot-scope="scope">
+              <el-tooltip effect="dark" content="修改" placement="top">
+                <i
+                  class="el-icon-edit tb-icon"
+                  @click="openCostEdit(scope.$index, scope.row)"
+                ></i>
+              </el-tooltip>
+
+              <el-tooltip 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>
+        <!-- 弹窗 新增/修改 -->
+        <cost-form-add-edit
+          :index="costmodelIndex"
+          :show-model="costshowModel"
+          :sitem="costsitem"
+          :spuCode="spuCode"
+          @refresh="costrefreshEdit"
+          @cancel="costshowModel = false"
+        />
+        <el-form-item class="fr">
+          <el-button
+            v-if="!isDetail"
+            :size="'mini'"
+            type="primary"
+            @click="submitForm"
+            >保 存
+          </el-button>
+        </el-form-item>
+      </el-col>
+          <el-col :span="24"
         ><el-form-item label="售价凭证类型" prop="proof_type">
           <el-radio-group
             v-model="ruleForm.proof_type"
@@ -143,73 +211,6 @@
           </ul>
         </el-form-item>
       </el-col>
-      <el-col :span="24">
-        <el-table
-          :data="ruleForm.good_ladder"
-          :size="'mini'"
-          border
-          stripe
-          style="width: 100%; margin: 0 0 20px 0"
-        >
-          <el-table-column prop="min_num" label="起订量(>=)" />
-          <el-table-column prop="sale_price" label="售价" />
-          <el-table-column prop="market_price" label="市场价" />
-          <el-table-column prop="market_platform" label="对比平台" />
-          <el-table-column prop="status" label="状态">
-            <template slot-scope="scope">
-              <el-tag
-                :size="'mini'"
-                :type="scope.row.status == '1' ? '' : 'warning'"
-                >{{ scope.row.status == "1" ? "启用" : "禁用" }}</el-tag
-              >
-            </template>
-          </el-table-column>
-          <el-table-column fixed="right">
-            <template slot="header" slot-scope="scope">
-              <span>操作</span>
-              <el-tooltip effect="dark" content="添加阶梯" placement="top">
-                <i
-                  class="el-icon-circle-plus-outline tb-icon fr"
-                  @click="openCostEdit(-1, {})"
-                ></i>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <el-tooltip effect="dark" content="修改" placement="top">
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="openCostEdit(scope.$index, scope.row)"
-                ></i>
-              </el-tooltip>
-
-              <el-tooltip 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>
-        <!-- 弹窗 新增/修改 -->
-        <cost-form-add-edit
-          :index="costmodelIndex"
-          :show-model="costshowModel"
-          :sitem="costsitem"
-          :spuCode="spuCode"
-          @refresh="costrefreshEdit"
-          @cancel="costshowModel = false"
-        />
-        <el-form-item class="fr">
-          <el-button
-            v-if="!isDetail"
-            :size="'mini'"
-            type="primary"
-            @click="submitForm"
-            >保 存
-          </el-button>
-        </el-form-item>
-      </el-col>
     </el-row>
   </el-form>
 </template>

src/views/goodStore/goodsOnline/detail.vue

@@ -28,8 +28,8 @@
                 </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 v-if="i !== 0">--</span
+                    ><span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
                   </span>
                 </template>
                 <template slot="good_info_img">
@@ -336,7 +336,7 @@ export default {
       if (!this.loading) {
         let model = {
           skuCode: this.queryId,
-          exam_status: e.state === "1" ? "3" : '7',
+          exam_status: e.state === "1" ? "3" : "7",
           online_time: e.online_time,
           remark: e.remark,
         };

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

@@ -0,0 +1,102 @@
+export default [
+  {
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+    span: 24,
+  },
+
+  // {
+  //   prop: "speclist",
+  //   label: "规格",
+  //   _slot_: "speclist",
+  //   span: 24,
+  // },
+
+  {
+    prop: "good_info_img",
+    _slot_: "good_info_img",
+    label: "详情图",
+    span: 24,
+  },
+  {
+    prop: "cat",
+    label: "分类",
+    _slot_: "cat",
+    span: 24,
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    span: 24,
+  },
+  {
+    prop: "is_stock",
+    label: "是否库存品",
+    _slot_: "is_stock",
+    span: 8,
+  },
+
+  {
+    prop: "unit",
+    label: "单位",
+    span: 8,
+  },
+  {
+    prop: "tax",
+    label: "税点",
+    append: '%',
+    span: 8,
+  },
+
+
+
+
+
+  // {
+  //   prop: "delivery_day",
+  //   label: "物流时间",
+  //   append: '天',
+  //   span: 12,
+  // },
+  // {
+  //   prop: "lead_time",
+  //   label: "供货周期",
+  //   append: '天',
+  //   span: 12,
+  // },
+  {
+    prop: "exclusive",
+    label: "专属类型",
+    _slot_: "exclusive",
+    span: 24,
+  },
+  // {
+  //   prop: "sample_day",
+  //   label: "调样周期",
+  //   append: '天',
+  //   span: 12,
+  // },
+  {
+    prop: "weight",
+    label: "商品总克重",
+    _slot_: "weight",
+    span: 24,
+  },
+  {
+    prop: "after_sales",
+    label: "售后说明",
+    span: 24,
+  },
+
+  // {
+  //   prop: "craft_desc",
+  //   label: "工艺说明",
+  //   span: 24,
+  // },
+
+
+
+
+]
+

src/views/sellOut/salesOrder/index.vue

@@ -238,7 +238,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        order_type: "1", //订单类型1为销售 2为咨询
+        order_type: "", //订单类型1为销售 2为咨询
         orderCode: "", //销售订单code
         apply_name: "", // 申请人
         good_name: "", // 产品名称
@@ -279,7 +279,7 @@ export default {
       this.input = "";
       this.customerCode = [];
       this.parmValue = {
-        order_type: "1", //订单类型1为销售 2为咨询
+        order_type: "", //订单类型1为销售 2为咨询
         orderCode: "", //销售订单code
         apply_name: "", // 申请人
         good_name: "", // 产品名称
@@ -353,7 +353,7 @@ export default {
       this.parmValue.good_name = this.select === "good_name" ? this.input : ""; // 申请人
       this.parmValue.apply_name =
         this.select === "apply_name" ? this.input : ""; // 采购供应商编号
-      this.parmValue.order_type = "1"; //订单类型1为销售订单 2为咨询订单
+      this.parmValue.order_type = ""; //订单类型1为销售订单 2为咨询订单
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

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

@@ -117,7 +117,7 @@
               max-height="300px"
               row-key="key"
             >
-              <el-table-column type="index" width="80" show-overflow-tooltip />
+              <el-table-column type="index" width="50" show-overflow-tooltip />
               <el-table-column
                 prop="receipt_quantity"
                 label="收货总数"
@@ -136,6 +136,7 @@
                   >
                     <el-input
                       v-model="scope.row.receipt_quantity"
+                      placeholder="收货总数"
                       :disabled="!scope.row.edit"
                     />
                   </el-form-item>
@@ -161,6 +162,7 @@
                   >
                     <el-input
                       v-model="scope.row.contactor"
+                      placeholder="收件联系人"
                       :disabled="!scope.row.edit"
                     />
                   </el-form-item>
@@ -184,6 +186,7 @@
                   >
                     <el-input
                       v-model="scope.row.mobile"
+                       placeholder="收货联系电话"
                       :disabled="!scope.row.edit"
                     />
                   </el-form-item>
@@ -208,6 +211,7 @@
                     <select-area
                       :value="scope.row.addr_code"
                       :disabled="!scope.row.edit"
+                      placeholder="收货省市区"
                       :size="'mini'"
                       @selectChange="select_area_change($event, scope.$index)"
                     />
@@ -233,6 +237,7 @@
                   >
                     <el-input
                       v-model="scope.row.addr"
+                      placeholder="详细地址"
                       :disabled="!scope.row.edit"
                     />
                   </el-form-item>