添加了一些字段，增加一份导出模板，一些功能

src/views/orderEntry/orderEnter/index.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="box">
+    <el-form
+      ref="form"
+      :model="ruleForm"
+      label-width="80px"
+      size="medium "
+      class="form"
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="销售方" prop="cs1" label-width="100px">
+            <el-select
+              v-model="ruleForm.cs1"
+              style="width: 100%"
+              placeholder="咨询类型"
+          >
+            <el-option
+              v-for="item in cs1Arr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="平台订单号" prop="cs2" label-width="100px">
+              <el-input v-model="ruleForm.cs2" placeholder="平台订单号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="PO编号" prop="cs3" label-width="100px">
+              <el-input v-model="ruleForm.cs3" placeholder="PO编号"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item label="平台下单时间" prop="cs3" label-width="100px">
+              <!-- <period-date-picker
+                  :start="parmValue.start"
+                  :end="parmValue.end"
+                  :width="'134px'"
+                  :size="searchSize"
+                  @timeReturned="handleTime"
+                /> -->
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <a class="downloadAddr" href="./static/C端订单导入模板.xlsx">下载模板</a>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+        cs1: "",
+        cs2: "",
+        cs3: "",
+        cs4: "",
+        cs5: "",
+        cs6: "",
+       
+      },
+       cs1Arr:[
+          { value: "0", label: "一地" },
+          { value: "1", label: "多地" },
+        ]
+    };
+  },
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.box {
+  width: 100%;
+  padding: 8px 12px 0 10px;
+}
+.downloadAddr {
+  width: 60px;
+  height: 30px;
+  background: red;
+  display: block;
+}
+.form {
+  width: 70%;
+}
+</style>
+

src/views/orderEntry/orderImport/columns.js

@@ -1,78 +1,78 @@
 const columns = [
 
   {
-    prop: "",
+    prop: "cs0",
     label: "平台订单号",
     fixed: "left",
     width: "152px",
   },
   {
-    prop: "",
+    prop: "cs1",
     label: "平台商品编号",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs2",
     label: "销售渠道",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs3",
     label: "平台订单下单时间",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs4",
     label: "订单单价",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs5",
     label: "销售数量",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs6",
     label: "订单总金额",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs7",
     label: "活动名称",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs8",
     label: "优惠金额",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs9",
     label: "优惠后的金额",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs10",
     label: "收费模式",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs11",
     label: "订单备注",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs12",
     label: "收货人",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs13",
     label: "联系电话",
     width: "140px",
   },
   {
-    prop: "",
+    prop: "cs14",
     label: "联系地址",
     width: "140px",
   },

src/views/orderEntry/orderImport/index.vue

@@ -124,18 +124,27 @@ export default {
       return false;
     },
     handleSuccess({ results, header }) {
+      console.log(results,header)
       if (results.length === 0) {
         this.$message.error("表格无有效数据！");
         return;
       }
       let head = [
-        "收货总数",
-        "收货联系人",
-        "收货联系电话",
-        "收货省名称",
-        "收货市名称",
-        "收货区名称",
-        "详细地址",
+        "平台订单号",
+        "平台商品编号",
+        "销售渠道",
+        "平台订单下单时间",
+        "订单单价",
+        "销售数量",
+        "订单总金额",
+        "活动名称",
+        "优惠金额",
+        "优惠后金额",
+        "收费模式",
+        "订单备注",
+        "收货人",
+        "联系电话",
+        "联系地址"
       ];
       if (head.length !== header.length) {
         this.$message.error("表头与导入模板不匹配！");
@@ -155,27 +164,38 @@ export default {
       this.tableHeader = header;
       this.tableData = [];
       let list = results;
-      let tableOk = true;
+      // let tableOk = true;
       this.ruleForm.order_addr = [];
       list.forEach((v1) => {
+        
         let b = Object.values(v1);
-        let item = this.get_code(b[3], b[4], b[5]);
+        console.log(b)
+        // let item = this.get_code(b[3], b[4], b[5]);
         let model = {
-          receipt_quantity: b[0] + "",
-          contactor: b[1] + "",
-          mobile: b[2] + "",
-          in_addr: b[3] + "/" + b[4] + "/" + b[5],
-          addr_code_name: item.name + "",
-          addr_code: item.code,
-          addr: b[6] + "",
-          edit: false,
+          cs0: b[0] + "",
+          cs1: b[1] + "",
+          cs2: b[2] + "",
+          cs3: b[3] + "",
+          cs4: b[4] + "",
+          cs5: b[5] + "",
+          cs6: b[6] + "",
+          cs7: b[7] + "",
+          cs8: b[8] + "",
+          cs9: b[9] + "",
+          cs10: b[10] + "",
+          cs11: b[11] + "",
+          cs12: b[12] + "",
+          cs13: b[13] + "",
+          cs14: b[14] + "",
+          
         };
-        this.ruleForm.order_addr.push(model);
+        console.log(model)
+        this.tableData.push(model);
       });
-      if (!tableOk) {
-        this.$message.error("最晚收货日期不正确，请将表格格式转为文本上传！");
-      }
-      console.log(this.ruleForm.order_add)
+      // if (!tableOk) {
+      //   this.$message.error("最晚收货日期不正确，请将表格格式转为文本上传！");
+      // }
+      console.log(this.tableData)
     },
     get_code(name1, name2, name3) {
       let name = "",

src/views/sellOut/bargainList/columns.js

@@ -59,11 +59,7 @@ const options12 = [
   { id: "1", name: "多地" },
 ]
 const editColumns = [
-  {
-    prop: "bargainNo",
-    label: "议价单编号",
-    span: 6
-  },
+  
   {
     prop: "bidsNo",
     label: "反馈商品编号",
@@ -180,6 +176,50 @@ const editColumns = [
     _slot_: "send_way",
     span: 6
   },
+  
+
+
+  {
+    prop: "good_num",
+    label: "购买数量",
+    _slot_: "good_num",
+    span: 6
+  },
+  {
+    prop: "metal_id",
+    label: "贵金属信息",
+    _slot_: "metal_id",
+    span: 18
+  },
+
+
+
+
+
+
+ 
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  
+  {
+    prop: "remark",
+    label: "采购备注",
+    span: 24
+  },
+
+  {
+    prop: "cost_desc",
+    label: "工艺说明",
+    span: 24
+  },
+  
+
+]
+
+const costArr = [
   {
     prop: "cert_fee",
     label: "成本证书费",
@@ -229,26 +269,14 @@ const editColumns = [
     append: '元',
     span: 6
   },
+]
 
-
+const bargainingArr = [
   {
-    prop: "good_num",
-    label: "购买数量",
-    _slot_: "good_num",
+    prop: "bargainNo",
+    label: "议价单编号",
     span: 6
   },
-  {
-    prop: "metal_id",
-    label: "贵金属信息",
-    _slot_: "metal_id",
-    span: 18
-  },
-
-
-
-
-
-
   {
     prop: "sale_price",
     label: "议价前售价",
@@ -268,11 +296,6 @@ const editColumns = [
     append: '%',
     span: 6
   },
-  {
-    prop: "addtime",
-    label: "创建时间",
-    span: 6
-  },
   {
     prop: "after_price",
     label: "议价后单价",
@@ -297,23 +320,11 @@ const editColumns = [
     label: "议价原因",
     span: 6
   },
-  {
-    prop: "remark",
-    label: "采购备注",
-    span: 24
-  },
-
-  {
-    prop: "cost_desc",
-    label: "工艺说明",
-    span: 24
-  },
   {
     prop: "bargain_remark",
     label: "议价备注",
     span: 24
   },
-
 ]
 
 const listCol = [
@@ -403,5 +414,7 @@ export {
   options10,
   options11,
   options12,
-  editColumns
+  editColumns,
+  bargainingArr,
+  costArr
 }

src/views/sellOut/bargainList/detail.vue

@@ -132,6 +132,23 @@
                   <span v-else>--</span>
                 </template>
               </show-data-table>
+
+              <show-data-table
+                style="padding: -5px 0 10px 0"
+                :newTime="newTime"
+                v-if="newTime !== '' && queryType === 'view'"
+                :sitem="sitem"
+                :columns="costArr"
+              >
+              </show-data-table>
+              <show-data-table
+                style="padding: -5px 0 10px 0"
+                :newTime="newTime"
+                v-if="newTime !== '' && queryType === 'view'"
+                :sitem="sitem"
+                :columns="bargainingArr"
+              >
+              </show-data-table>
             </el-collapse-item>
             <el-collapse-item
               title="业务部门审批"
@@ -196,6 +213,8 @@ import { mapGetters } from "vuex";
 
 import {
   editColumns,
+  costArr,
+  bargainingArr,
   options1,
   options2,
   options3,
@@ -231,6 +250,8 @@ export default {
     return {
       statusList: [],
       size: "small",
+      costArr:costArr,
+      bargainingArr:bargainingArr,
       editColumns: editColumns,
       options1: options1,
       options2: options2,

src/views/sellOut/zixunOrder/columns.js

@@ -450,6 +450,16 @@ const feedbackListCol = [
     label: "议价后销售单价",
     "width": "110"
   },
+  {
+    prop: "cost_fee",
+    label: "议价前工艺费",
+    "width": "110"
+  },
+  {
+    prop: "sale_cost_fee",
+    label: "议价后工艺费",
+    "width": "110"
+  },
 
   {
     prop: "good_img",

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

@@ -89,7 +89,41 @@
                 :name="'ruleForm.bargain_price'"
                 :placeholder="'期望售价'"
                 :min="0"
-                :disabled="false"
+                :disabled="sitem.is_gold_price == 0 ? false : true"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'bargain_price')"
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- 需修改字段 -->
+          <el-col :span="12">
+            <el-form-item label="当前工艺费" label-width="108px">
+              <el-input
+                v-if="show_sitem"
+                v-model="show_sitem.sale_price"
+                 maxlength="20"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="期望工艺费"
+              prop="bargain_price"
+              label-width="108px"
+            >
+              <digital-input
+                :values="ruleForm.bargain_price"
+                :name="'ruleForm.bargain_price'"
+                :placeholder="'期望工艺费'"
+                :min="0"
+                :disabled="sitem.is_gold_price == 1 ? false : true"
                 :max="100000000000"
                 :position="'right'"
                 :precision="2"
@@ -100,6 +134,8 @@
               />
             </el-form-item>
           </el-col>
+
+
           <el-col :span="18">
             <el-form-item
               label="议价备注:"
@@ -209,7 +245,9 @@ export default {
       }
     },
   },
-  mounted() {},
+  mounted() {
+    console.log("11111111111111111",this.sitem.is_gold_price)
+  },
   methods: {
     itemidChange(e) {
       this.ruleForm.itemid = e;

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

@@ -145,6 +145,7 @@
       </template>
     </ex-table>
     <add-edit-bargain
+    
       :showModel="wantBmodel"
       :sitem="wantBsitem"
       @cancel="wantBmodel = false"