Merge branch 'dev' into sit

src/apis/service/orderEntry/orderEnter/index.js

@@ -6,6 +6,8 @@ export default {
     add: (data, params) => http(api + "brandcreate", data, "post", params),
     // 删除
     delete: (data, params) => http(api + "branddel", data, "post", params),
+    delimportorder: (data, params) => http(api + "delimportorder", data, "post", params),
+    
     // 分页查询
     list: (data, params) => http(api + "orderimportlist", data, "post", params),
     // 更新

src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -179,7 +179,6 @@ const onlineColumns = [
     _slot_: "good_img",
     label: "商品主图",
   },
-
   {
     prop: "good_info_img",
     _slot_: "good_info_img",
@@ -334,11 +333,22 @@ const onlineColumns = [
   //   span: 8,
   // },
 
-  // {
-  //   prop: "delivery_place_cn",
-  //   label: "发货地",
-  //   span: 8,
-  // },
+  {
+    prop: "delivery_place_cn",
+    label: "发货地",
+    span: 8,
+  },
+  {
+    prop: "customized",
+    label: "工期",
+    append: '天',
+    span: 8,
+  },
+  {
+    prop: "purchase",
+    label: "采购人",
+    span: 8,
+  },
   // {
   //   prop: "origin_place_cn",
   //   label: "产地",

src/views/orderEntry/orderEnter/columns.js

@@ -160,9 +160,10 @@ const listCol = [{
   label: "操作",
   fixed: "right",
   _noset_: true,
-  width: "50px",
+  width: "100px",
   _slot_: "operation",
 },
+
 ]
 
 export {

src/views/orderEntry/orderEnter/index.vue

@@ -98,7 +98,7 @@
                     type="primary"
                     icon="el-icon-refresh-right"
                     class="btn"
-                    @click="reset"
+                    @click="resetF5"
                     >刷新</el-button
                   >
                 </el-col>
@@ -196,7 +196,20 @@
               @click="wantGo(scope.row.id, scope.row.status)"
             ></i>
           </el-tooltip>
+          <el-tooltip
+          v-if="powers.some((item) => item == '006')"
+          effect="dark"
+          content="删除"
+          placement="top"
+        >
+          <i
+            class="el-icon-delete tb-icon"
+            @click="deleteItem([scope.row.id])"
+          ></i>
+        </el-tooltip>
         </template>
+
+        
       </ex-table>
     </div>
     <div v-else>
@@ -349,6 +362,7 @@ export default {
       let res = await asyncRequest.orderimportlist(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
+        console.log(this.tableData)
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -358,6 +372,36 @@ export default {
       }
       this.loading = false;
     },
+    //删除
+    async deleteItem(ids) {
+      
+      
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            ids
+          };
+          const res = await asyncRequest.delimportorder(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     //导入时间
     async addtime(e) {
       this.parmValue.addtime_start = e.startTime || "";
@@ -459,6 +503,10 @@ export default {
       };
       this.searchList();
     },
+    //刷新按钮
+    resetF5(){
+      this.searchList();
+    },
     //搜索按钮
     search() {
       this.pageInfo.curr = 1;

src/views/orderEntry/orderImport/index.vue

@@ -223,6 +223,9 @@ export default {
         { name: "销售渠道", str: "sale_source" },
         { name: "平台商品编号", str: "plat_code" },
         { name: "单价（元）", str: "price" },
+        { name: "数量", str: "num" },
+        { name: "收费模式", str: "mode" },
+        { name: "订单备注", str: "order_remark" },
         { name: "收货人", str: "contactor" },
         { name: "联系电话", str: "mobile" },
         { name: "联系地址", str: "addr" },

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

@@ -69,6 +69,11 @@ const addColumns = [
     label: "采购人员",
     span: 8,
   },
+  {
+    prop: "delivery_place_cn",
+    label: "发货地",
+    span: 24,
+  },
   {
     prop: "after_sales",
     label: "售后说明",
@@ -110,6 +115,7 @@ const showColumns = [
     _slot_: "companyName",
     span: 12,
   },
+  
   // {
   //   prop: "good_name",
   //   label: "商品名称",
@@ -128,7 +134,7 @@ const showColumns = [
   //   span: 6,
   // },
   {
-    prop: "platform_id",
+    prop: "platform_name",
     label: "所属平台",
     span: 6,
   },