1

src/views/orderEntry/orderConfirm/index.vue

@@ -5,23 +5,22 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <show-data-table
-        style="margin: 0; padding: 0"
+        style="margin: 0 0 10px 0; padding: 0"
         :sitem="sitem"
-        v-if="sitem"
+        v-if="sitem && status"
         :columns="showColumns"
+        border
       >
-        <template slot="status">
+        <template #status>
           <el-tag
             :size="'mini'"
-            v-text="
-              (statusOptions.find((item) => item.value == sitem.status) || {})
-                .label || '--'
-            "
-          ></el-tag>
+            :type="sitem.status_type"
+            style="margin: auto"
+            >{{ sitem.status_name }}</el-tag
+          >
         </template>
       </show-data-table>
 
-      <!-- orderCode -->
       <el-form
         ref="ruleForm"
         :model="ruleForm"
@@ -69,31 +68,21 @@
                 <el-col :span="11" class="nop">
                   <el-row>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="platform_code"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="platform_code">
                         <el-input
                           v-model="ruleForm.platform_code"
                           maxlength="100"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="平台订单号"
                         /> </el-form-item
                     ></el-col>
 
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="po_code"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="po_code">
                         <el-input
                           v-model="ruleForm.po_code"
                           maxlength="100"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="其他单号"
                         />
                       </el-form-item>
@@ -221,36 +210,26 @@
                 <el-col :span="11" class="nop">
                   <el-row>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="platform_time"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="platform_time">
                         <el-date-picker
                           type="datetime"
                           placeholder="平台订单下单时间"
                           v-model="ruleForm.platform_time"
                           style="width: 100%"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           :picker-options="pickerOptions"
                           @change="selectTime"
                         >
                         </el-date-picker> </el-form-item
                     ></el-col>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="plat_code"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="plat_code">
                         <el-input
                           v-model="ruleForm.plat_code"
                           maxlength="100"
                           readonly
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           @focus="showModel = true"
                           placeholder="平台商品编号"
                       /></el-form-item>
@@ -389,17 +368,12 @@
                 <el-col :span="11" class="nop">
                   <el-row>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="mode"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="mode">
                         <el-select
                           v-model="ruleForm.mode"
                           style="width: 100%"
                           clearable
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="收费模式"
                         >
                           <el-option
@@ -413,17 +387,12 @@
                     </el-col>
 
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="sale_source"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="sale_source">
                         <el-select
                           v-model="ruleForm.sale_source"
                           style="width: 100%"
                           clearable
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="销售渠道"
                         >
                           <el-option
@@ -464,31 +433,21 @@
                 <el-col :span="11" class="nop">
                   <el-row>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="contactor"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="contactor">
                         <el-input
                           v-model="ruleForm.contactor"
                           maxlength="100"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="收货人"
                         />
                       </el-form-item>
                     </el-col>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="mobile"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="mobile">
                         <el-input
                           v-model="ruleForm.mobile"
                           maxlength="100"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="收货电话"
                         />
                       </el-form-item>
@@ -519,32 +478,22 @@
                 <el-col :span="11" class="nop">
                   <el-row>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="addr_code"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="addr_code">
                         <select-area
                           :value="ruleForm.addr_code"
                           :size="'mini'"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="收货省市区"
                           @selectChange="select_area_change($event)"
                         />
                       </el-form-item>
                     </el-col>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="addr"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="addr">
                         <el-input
                           v-model="ruleForm.addr"
                           maxlength="100"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           placeholder="详细地址"
                         />
                       </el-form-item>
@@ -564,16 +513,11 @@
                 <el-col :span="4">{{ importSitem.order_remark }}</el-col>
                 <el-col :span="9">{{ confirmSitem.order_remark }}</el-col>
                 <el-col :span="11">
-                  <el-form-item
-                    prop="order_remark"
-                    :style="{
-                      marginBottom: status !== '2' ? '0px' : '18px',
-                    }"
-                  >
+                  <el-form-item prop="order_remark">
                     <el-input
                       v-model="ruleForm.order_remark"
                       maxlength="100"
-                      :disabled="status !== '2'"
+                      :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                       placeholder="订单备注" /></el-form-item
                 ></el-col>
               </el-row>
@@ -598,12 +542,7 @@
                 <el-col :span="11" class="nop">
                   <el-row>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="num"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="num">
                         <digital-input
                           :values="ruleForm.num"
                           :placeholder="'数量'"
@@ -614,23 +553,18 @@
                           :size="'mini'"
                           :controls="false"
                           :append="''"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           @reschange="number_change($event, 'num')"
                         />
                       </el-form-item>
                     </el-col>
                     <el-col :span="12" class="border">
-                      <el-form-item
-                        prop="price"
-                        :style="{
-                          marginBottom: status !== '2' ? '0px' : '18px',
-                        }"
-                      >
+                      <el-form-item prop="price">
                         <digital-input
                           :values="ruleForm.price"
                           :placeholder="'单价'"
                           :min="price_min"
-                          :disabled="status !== '2'"
+                          :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                           :max="100000000000"
                           :position="'right'"
                           :precision="2"
@@ -656,17 +590,12 @@
                 <el-col :span="4">{{ importSitem.activity_name }}</el-col>
                 <el-col :span="9">{{ confirmSitem.activity_name }}</el-col>
                 <el-col :span="11">
-                  <el-form-item
-                    prop="activity_code"
-                    :style="{
-                      marginBottom: status !== '2' ? '0px' : '18px',
-                    }"
-                  >
+                  <el-form-item prop="activity_code">
                     <el-select
                       v-model="ruleForm.activity_code"
                       style="width: 100%"
                       clearable
-                      :disabled="status !== '2'"
+                      :disabled="!(status === '2'&& powers.some((item) => item == '008'))"
                       @change="get_new_price"
                       placeholder="活动名称"
                     >
@@ -701,7 +630,7 @@
               </el-row>
             </div>
           </div>
-          <div class="tab-row" v-if="status === '2'">
+          <div class="tab-row" v-if="status === '2'&& powers.some((item) => item == '008')">
             <div class="tab-item-label">
               <label style="color: transparent">*</label>
             </div>
@@ -773,25 +702,25 @@ export default {
     return {
       statusOptions: [],
       showColumns: [
-        {
-          prop: "status",
-          label: "状态",
-          _slot_: "status",
-          span: 6,
-        },
         {
           prop: "creater",
           label: "导入人",
           span: 6,
         },
-           {
+        {
           prop: "addtime",
           label: "导入时间",
           span: 6,
         },
         {
-          prop: "updater",
-          label: "确认人",
+          prop: "status",
+          label: "状态",
+          _slot_: "status",
+          span: 6,
+        },
+        {
+          prop: "orderCode",
+          label: "订单编号",
           span: 6,
         },
         {
@@ -799,7 +728,16 @@ export default {
           label: "确认人",
           span: 6,
         },
-        
+        {
+          prop: "success_date",
+          label: "录入成功时间",
+          span: 6,
+        },
+
+        {
+          prop: "platform_name",
+          label: "客户名称",
+        },
       ],
 
       showModel: false,
@@ -842,7 +780,6 @@ export default {
       options9,
       onlineColumns,
       priceLoding: false,
-      showColumns: [],
     };
   },
   mounted() {
@@ -852,6 +789,48 @@ export default {
   methods: {
     change_good() {},
 
+    statusActive(status) {
+      let active = "";
+      switch (status) {
+        case "1":
+          active = "系统验证数据中";
+          break;
+        case "2":
+          active = "待确认订单信息";
+          break;
+        case "3":
+          active = "待处理(待扣减库存)";
+          break;
+        case "4":
+          active = "库存不足";
+          break;
+        case "5":
+          active = "订单录入成功";
+          break;
+      }
+      return active;
+    },
+    statusActiveTag(status) {
+      let active = "";
+      switch (status) {
+        case "1":
+          active = "";
+          break;
+        case "2":
+          active = "info";
+          break;
+        case "3":
+          active = "warning";
+          break;
+        case "4":
+          active = "danger";
+          break;
+        case "5":
+          active = "success";
+          break;
+      }
+      return active;
+    },
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
@@ -924,12 +903,19 @@ export default {
           orderCode,
           creater,
           addtime,
+          updater,
+          success_date,
         } = data;
         this.sitem = {
           orderCode,
           status,
           creater,
           addtime,
+          updater,
+          success_date,
+          status_name: this.statusActive(status),
+          status_type: this.statusActiveTag(status),
+          platform_name: "",
         };
         this.importSitem = simport ? JSON.parse(JSON.stringify(simport)) : null;
         this.confirmSitem = confirm
@@ -973,6 +959,10 @@ export default {
           this.conGoodData = data;
         } else {
           this.subGoodData = data;
+          const { platform_name } = data;
+          if (this.status !== '2') {
+            this.sitem.platform_name = platform_name+'客户';
+          }
         }
       } else if (code >= 100 && code <= 104) {
         await this.logout();

src/views/orderEntry/orderEnter/columns.js

@@ -42,7 +42,7 @@ const listCol = [{
 //   width: "140px",
 // },
 {
-  prop: "discount_price",
+  prop: "before_discount_all_price",
   label: "订单总金额",
   width: "140px",
 },
@@ -160,7 +160,7 @@ const listCol = [{
   label: "操作",
   fixed: "right",
   _noset_: true,
-  width: "100px",
+  width: "80px",
   _slot_: "operation",
 },
 

src/views/orderEntry/orderEnter/index.vue

@@ -27,7 +27,13 @@
         @selection="selection_change"
         ><template #table-header="{}">
           <div class="searchBox" style="width: 100%">
-            <el-form ref="form" :model="parmValue" size="medium " class="form" style="padding-left: 80px;">
+            <el-form
+              ref="form"
+              :model="parmValue"
+              size="medium "
+              class="form"
+              style="padding-left: 80px"
+            >
               <el-row :gutter="10">
                 <el-col :span="8" style="width: 361px">
                   <el-form-item>
@@ -83,7 +89,11 @@
                   style="width: 132px; margin-left: auto"
                 >
                   <el-button
-                    v-if="powers && powers.length > 0 && powers.some((item) => item == '085')"
+                    v-if="
+                      powers &&
+                      powers.length > 0 &&
+                      powers.some((item) => item == '085')
+                    "
                     size="mini"
                     type="primary"
                     icon="el-icon-search"
@@ -152,7 +162,11 @@
                 >
                   <el-button
                     type="primary"
-                    v-if="powers && powers.length > 0 && powers.some((item) => item == '013')"
+                    v-if="
+                      powers &&
+                      powers.length > 0 &&
+                      powers.some((item) => item == '013')
+                    "
                     icon="el-icon-download"
                     class="btn"
                     size="mini"
@@ -163,13 +177,22 @@
                 </el-col>
 
                 <el-col :span="2" class="fr" style="width: 90px">
-                  <el-button class="btn entry" @click="entry" size="mini" type="success" v-if="powers && powers.length > 0 && powers.some((item) => item == '086')"
+                  <el-button
+                    class="btn entry"
+                    @click="entry"
+                    size="mini"
+                    type="success"
+                    v-if="
+                      powers &&
+                      powers.length > 0 &&
+                      powers.some((item) => item == '086')
+                    "
                     >订单导入</el-button
                   >
                 </el-col>
                 <el-col :span="2" class="fr" style="width: 66px">
                   <el-button
-                  type="warning"
+                    type="warning"
                     icon="el-icon-refresh-right"
                     class="btn"
                     @click="reset"
@@ -182,7 +205,12 @@
           </div>
         </template>
         <template #statusTxt="{ scope }">
-          <el-tag :size="'mini'" :type="statusActiveTag(scope.row.status)" style="margin:auto;">{{ statusActive(scope.row.status) }}</el-tag>
+          <el-tag
+            :size="'mini'"
+            :type="statusActiveTag(scope.row.status)"
+            style="margin: auto"
+            >{{ statusActive(scope.row.status) }}</el-tag
+          >
         </template>
         <template #operation="{ scope }">
           <el-tooltip
@@ -197,19 +225,17 @@
             ></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>
+            v-if="powers.some((item) => item == '006')&&scope.row.status==='2'"
+            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>
@@ -362,7 +388,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)
+        console.log(this.tableData);
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -374,8 +400,6 @@ export default {
     },
     //删除
     async deleteItem(ids) {
-      
-      
       await this.$confirm("确定要删除？", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -383,7 +407,7 @@ export default {
       })
         .then(async () => {
           const model = {
-            ids
+            ids,
           };
           const res = await asyncRequest.delimportorder(model);
           if (res && res.code === 0) {
@@ -504,7 +528,7 @@ export default {
       this.searchList();
     },
     //刷新按钮
-    resetF5(){
+    resetF5() {
       this.searchList();
     },
     //搜索按钮
@@ -569,7 +593,7 @@ export default {
   width: 100%;
   // margin-top: 20px;
 }
-/deep/ .setcol-table-lie{
+/deep/ .setcol-table-lie {
   top: 5px !important;
 }
 /deep/ .el-dropdown-selfdefine {

src/views/orderEntry/orderImport/index.vue

@@ -149,7 +149,7 @@ export default {
           price: b[5] + "",
           num: b[6] + "",
           // before_discount_all_price: b[7] + "",
-          discount_price: b[7] + "",
+          before_discount_all_price: b[7] + "",
           // after_price: b[9] + "",
           activity_name: b[8] + "",
           mode: b[9] + "",