snow 2 lat temu
rodzic
commit
181eb93c17

Plik diff jest za duży
+ 0 - 0
dist/static/js/0.js


+ 10 - 10
src/views/sellOut/hawbWorkbench/index.vue

@@ -57,15 +57,15 @@
         <el-collapse-item title="待分单" name="2">
           <div style="width:100%">
             <el-table size="mini">
-              <el-table-column prop="ckbm" label="仓库号码" width="120" />
-              <el-table-column prop="ckmc" label="仓库名称" width="120" />
-              <el-table-column prop="ywgsbm" label="业务公司编码" width="120" />
-              <el-table-column prop="ywgsmc" label="业务公司名称" width="120" />
-              <el-table-column prop="ckszgys" label="仓库所在供应商编码" width="140" />
-              <el-table-column prop="ckszgys" label="仓库所在供应商名称" width="140" />
-              <el-table-column prop="ckfzr" label="仓库负责人" width="120" />
-              <el-table-column prop="kykc" label="可用库存" width="120" />
-              <el-table-column prop="ckkfs" label="仓库可发数" width="120">
+              <el-table-column prop="ckbm" label="仓库号码" min-width="120" />
+              <el-table-column prop="ckmc" label="仓库名称" min-width="120" />
+              <el-table-column prop="ywgsbm" label="业务公司编码" min-width="120" />
+              <el-table-column prop="ywgsmc" label="业务公司名称" min-width="120" />
+              <el-table-column prop="ckszgys" label="仓库所在供应商编码" min-width="140" />
+              <el-table-column prop="ckszgys" label="仓库所在供应商名称" min-width="140" />
+              <el-table-column prop="ckfzr" label="仓库负责人" min-width="120" />
+              <el-table-column prop="kykc" label="可用库存" min-width="120" />
+              <el-table-column prop="ckkfs" label="仓库可发数" min-width="120">
                 <el-input placeholder="仓库可发数" />
               </el-table-column>
             </el-table>
@@ -113,7 +113,7 @@ export default {
   methods: {
     async onSearch() {
       this.loading = true
-      const { data } = await asyncRequest.list({ size: '200' })
+      const { data } = await asyncRequest.list({ size: '20' })
       this.loading = false
       if (data.list.length > 0) {
         this.onActiveKey(data.list[0])

+ 209 - 212
src/views/sellOut/project/components/buyGoodModal.vue

@@ -1,27 +1,27 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="'项目下单'"
     :center="true"
     align="left"
     top="5vh"
     width="1040px"
-    @close="showModelThis = false"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
-    v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
     append-to-body
+    @close="showModelThis = false"
   >
     <el-card style="margin-top: -20px">
       <el-row>
         <el-col :span="24">
           <show-data-table
+            v-if="newTime !== '' && sitem"
             style="margin: 0; padding: 0"
             border
-            :newTime="newTime"
-            v-if="newTime !== '' && sitem"
+            :new-time="newTime"
             :sitem="sitem"
             :columns="ShowDataTableColumns"
           />
@@ -30,30 +30,28 @@
           <span style="line-height: 30px">商品下单:</span>
           <el-button-group :size="'mini'" class="fr" style="margin: 0 0 8px 0">
             <el-button
+              v-if="total !== 0"
               class="fr"
               type="primary"
               :size="'mini'"
               :disabled="index === 0"
-              v-if="total !== 0"
               icon="el-icon-arrow-left"
               @click="prev_goods()"
-            ></el-button>
+            />
             <el-button
+              v-if="total !== 0"
               type="primary"
               class="fr"
-              v-if="total !== 0"
               :size="'mini'"
               style="height: 29px"
-              >商品共{{ index + 1 }}/{{ total }}</el-button
-            >
+            >商品共{{ index + 1 }}/{{ total }}</el-button>
             <el-button
+              v-if="total !== 0"
               type="primary"
               class="fr"
-              v-if="total !== 0"
-              @click="next_goods()"
               :size="'mini'"
-              ><i class="el-icon-arrow-right el-icon--right" :size="'mini'"></i
-            ></el-button>
+              @click="next_goods()"
+            ><i class="el-icon-arrow-right el-icon--right" :size="'mini'" /></el-button>
           </el-button-group>
         </el-col>
         <el-col :span="24">
@@ -75,6 +73,7 @@
                   <img
                     v-for="(si, sii) in scope.row.good_img"
                     :key="si + sii"
+                    v-viewer
                     :src="si"
                     class="hover fl"
                     style="
@@ -84,8 +83,7 @@
                       margin: 0 2px 0 0;
                     "
                     alt=""
-                    v-viewer
-                  />
+                  >
                 </div>
               </template>
             </el-table-column>
@@ -118,32 +116,31 @@
             <el-table-column prop="num" label="数量" width="100" show-overflow-tooltip />
             <el-table-column
               prop="sendtype"
-              label="发货方式"
+              label="下单方式"
               width="150"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.sendtype"
-                  placeholder="发货方式"
+                  placeholder="下单方式"
                   :size="'mini'"
-                  @change="sendtype_change($event, scope.$index)"
                   style="width: 100%"
+                  @change="sendtype_change($event, scope.$index)"
                 >
                   <el-option
                     v-for="item in options"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  >
-                  </el-option>
+                  />
                 </el-select>
               </template>
             </el-table-column>
           </el-table>
         </el-col>
-        <el-col :span="24" v-if="sendtype + '' === '1'" style="padding: 15px 0 0 0">
-          <el-form :model="addrForm" ref="addrForm" :size="'mini'">
+        <el-col v-if="sendtype + '' === '1'" :span="24" style="padding: 15px 0 0 0">
+          <el-form ref="addrForm" :model="addrForm" :size="'mini'">
             <el-table
               :data="addrForm.order_addr"
               border
@@ -286,7 +283,7 @@
                       class="el-icon-circle-plus-outline tb-icon"
                       style="color: #6954f0"
                       @click="openHouseModal(-1)"
-                    ></i>
+                    />
                   </el-tooltip>
                   <el-tooltip
                     class="fr"
@@ -299,7 +296,7 @@
                       class="el-icon-upload2 tb-icon"
                       style="color: #6954f0"
                       @click="addrmodel = true"
-                    ></i>
+                    />
                   </el-tooltip>
                   <el-tooltip
                     class="fr"
@@ -312,40 +309,40 @@
                       <i
                         class="el-icon-download tb-icon"
                         style="color: #6954f0; margin: 0"
-                      ></i>
+                      />
                     </a>
                   </el-tooltip>
                 </template>
                 <template slot-scope="scope">
                   <el-tooltip
+                    v-if="!scope.row.edit"
                     effect="dark"
                     content="编辑"
-                    v-if="!scope.row.edit"
                     placement="top"
                   >
                     <i
                       class="el-icon-edit tb-icon"
                       @click="openHouseModal(scope.$index)"
-                    ></i>
+                    />
                   </el-tooltip>
 
                   <el-tooltip
+                    v-if="scope.row.edit"
                     effect="dark"
                     content="保存"
-                    v-if="scope.row.edit"
                     placement="top"
                   >
                     <i
                       class="el-icon-circle-check tb-icon"
                       @click="checkRow(scope.$index)"
-                    ></i>
+                    />
                   </el-tooltip>
 
                   <el-tooltip effect="dark" content="删除" placement="top">
                     <i
                       class="el-icon-delete tb-icon"
                       @click="deleteRow(scope.$index, addrForm.order_addr)"
-                    ></i>
+                    />
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -364,9 +361,9 @@
   </el-dialog>
 </template>
 <script>
-import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/sellOut/project";
-import searchStockGoodModal from "@/components/search-stock-good-modal";
+import resToken from '@/mixins/resToken'
+import asyncRequest from '@/apis/service/sellOut/project'
+import searchStockGoodModal from '@/components/search-stock-good-modal'
 import {
   isnumber,
   isMobile,
@@ -374,367 +371,367 @@ import {
   isEmoticon,
   isSpecialSymbol,
   hasSpace,
-  isAddr,
-} from "@/utils/validate";
-import inAddrModel from "@/components/in-addr-model";
-import { ShowDataTableColumns } from "./ShowDataTableColumns";
+  isAddr
+} from '@/utils/validate'
+import inAddrModel from '@/components/in-addr-model'
+import { ShowDataTableColumns } from './ShowDataTableColumns'
 export default {
-  name: "buyGoodModal",
-  props: ["showModel", "sitem"],
-  mixins: [resToken],
+  name: 'BuyGoodModal',
   components: { searchStockGoodModal, inAddrModel },
+  mixins: [resToken],
+  props: ['showModel', 'sitem'],
   data() {
     const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空!"));
+      if (value === '') {
+        callback(new Error('手机号不能为空!'))
       } else {
         if (!isMobile(value)) {
-          callback(new Error("手机号格式不正确!"));
+          callback(new Error('手机号格式不正确!'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validateWeight = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("收货总数不能为空!"));
+      if (value === '') {
+        callback(new Error('收货总数不能为空!'))
       } else {
         if (!isnumber(value)) {
-          callback(new Error("收货总数仅支持整数!"));
+          callback(new Error('收货总数仅支持整数!'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validatecontactor = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("联系人不能为空!"));
+      if (value === '') {
+        callback(new Error('联系人不能为空!'))
       } else {
         if (value.length < 2 || value.length > 10) {
-          callback(new Error("联系人规则为2~10位汉字!"));
+          callback(new Error('联系人规则为2~10位汉字!'))
         } else {
           if (!isChinese(value)) {
-            callback(new Error("联系人规则为2~10位汉字!"));
+            callback(new Error('联系人规则为2~10位汉字!'))
           } else if (isEmoticon(value)) {
-            callback(new Error("联系人规则为2~10位汉字!"));
+            callback(new Error('联系人规则为2~10位汉字!'))
           } else {
-            callback();
+            callback()
           }
         }
       }
-    };
+    }
     const validateAddr = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("详细地址不能为空!"));
+      if (value === '') {
+        callback(new Error('详细地址不能为空!'))
       } else {
         if (hasSpace(value)) {
-          callback(new Error("不能出现/回车/换行符!"));
+          callback(new Error('不能出现/回车/换行符!'))
         } else if (isSpecialSymbol(value)) {
-          callback(new Error("不能使用英文特殊字符!"));
+          callback(new Error('不能使用英文特殊字符!'))
         } else if (isAddr(value)) {
-          callback();
+          callback()
         } else {
-          callback(new Error("详细地址填写不规范!"));
+          callback(new Error('详细地址填写不规范!'))
         }
       }
-    };
+    }
     return {
       loading: false,
       addrmodel: false,
       showModelThis: this.showModel,
       showGoodsModel: false,
       ShowDataTableColumns: ShowDataTableColumns,
-      planNo: "",
-      arrtime: "",
+      planNo: '',
+      arrtime: '',
       project_list: [],
       options: [
         {
-          value: "1",
-          label: "直接发货",
+          value: '1',
+          label: '有地址下单'
         },
         {
-          value: "2",
-          label: "延时发货",
-        },
+          value: '2',
+          label: '无地址下单'
+        }
       ],
       index: 0,
       total: 0,
       order_good: [],
-      sendtype: "1",
+      sendtype: '1',
       addrForm: {
-        order_addr: [], //收货地址
+        order_addr: [] // 收货地址
       },
       addrRules: {
         receipt_quantity: [
           {
             required: true,
             validator: validateWeight,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
 
         contactor: [
           {
             required: true,
-            trigger: "blur",
-            validator: validatecontactor,
-          },
+            trigger: 'blur',
+            validator: validatecontactor
+          }
         ],
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
 
         addr_code: [
           {
-            type: "array",
+            type: 'array',
             required: false,
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         addr: [
           {
             required: true,
             validator: validateAddr,
-            trigger: "blur",
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
 
       loading: false,
-      id: "",
-    };
+      id: ''
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     closeModel() {
-      console.log("closeModel!!");
-      this.showModelThis = false;
+      console.log('closeModel!!')
+      this.showModelThis = false
     },
 
     async initForm() {
-      this.loading = true;
-      this.project_list = [];
-      console.log(this.sitem);
-      const { planNo, in_arrival_time, feedback } = this.sitem;
-      this.planNo = planNo || "";
-      this.arrtime = in_arrival_time || "";
-      let goods = JSON.parse(JSON.stringify(feedback));
+      this.loading = true
+      this.project_list = []
+      console.log(this.sitem)
+      const { planNo, in_arrival_time, feedback } = this.sitem
+      this.planNo = planNo || ''
+      this.arrtime = in_arrival_time || ''
+      const goods = JSON.parse(JSON.stringify(feedback))
       if (goods && goods.length > 0) {
         goods.forEach((e) => {
-          e.sendtype = "1";
-          let model = JSON.parse(JSON.stringify(e));
-          let item = {
+          e.sendtype = '1'
+          const model = JSON.parse(JSON.stringify(e))
+          const item = {
             order_good: [model],
-            order_addr: [],
-          };
-          this.project_list.push(item);
-        });
+            order_addr: []
+          }
+          this.project_list.push(item)
+        })
       }
-      this.index = 0;
-      this.total = this.project_list.length;
-      await this.resetForm(this.index);
-      this.getNewTime();
-      this.loading = false;
+      this.index = 0
+      this.total = this.project_list.length
+      await this.resetForm(this.index)
+      this.getNewTime()
+      this.loading = false
     },
     addrRefresh(e) {
-      const { list } = e;
-      this.addrForm.order_addr.push(...list);
+      const { list } = e
+      this.addrForm.order_addr.push(...list)
     },
     async prev_goods() {
-      this.index--;
-      await this.resetForm(this.index);
+      this.index--
+      await this.resetForm(this.index)
     },
     async next_goods() {
-      const { order_addr } = this.addrForm;
-      const { num } = this.order_good[0];
-      let ta = 0;
-      if (this.sendtype + '' === "1" && order_addr && order_addr.length === 0) {
-        this.$message.warning("直接发货需要录入地址!");
-        return;
+      const { order_addr } = this.addrForm
+      const { num } = this.order_good[0]
+      let ta = 0
+      if (this.sendtype + '' === '1' && order_addr && order_addr.length === 0) {
+        this.$message.warning('直接发货需要录入地址!')
+        return
       }
-      let isedit = false;
+      let isedit = false
       order_addr.forEach((e) => {
-        ta += e.receipt_quantity * 1;
+        ta += e.receipt_quantity * 1
         if (e.edit) {
-          isedit = true;
+          isedit = true
         }
-      });
+      })
       if (isedit) {
-        this.$message.warning("当前已有地址在编辑,请保存后再试!");
-        return;
+        this.$message.warning('当前已有地址在编辑,请保存后再试!')
+        return
       }
-      if (this.sendtype + '' === "1" && ta !== parseInt(num + "")) {
-        this.$message.warning("收货数量总数与购买数量总数不一致!");
-        return;
+      if (this.sendtype + '' === '1' && ta !== parseInt(num + '')) {
+        this.$message.warning('收货数量总数与购买数量总数不一致!')
+        return
       }
 
-      this.project_list[this.index].order_good[0].sendtype = this.sendtype;
+      this.project_list[this.index].order_good[0].sendtype = this.sendtype
       this.project_list[this.index].order_addr =
         this.addrForm.order_addr.length === 0
           ? []
-          : JSON.parse(JSON.stringify(this.addrForm.order_addr));
+          : JSON.parse(JSON.stringify(this.addrForm.order_addr))
       if (this.index + 1 === this.total) {
-        this.submitForm();
+        this.submitForm()
       } else {
-        this.index++;
+        this.index++
 
-        await this.resetForm(this.index);
+        await this.resetForm(this.index)
       }
     },
 
     getNewTime() {
-      this.newTime = new Date().valueOf();
+      this.newTime = new Date().valueOf()
     },
     sendtype_change(e, index) {
-      this.order_good[index].sendtype = e;
-      this.sendtype = this.order_good[index].sendtype;
+      this.order_good[index].sendtype = e
+      this.sendtype = this.order_good[index].sendtype
     },
 
     async resetForm(index) {
-      //重置
+      // 重置
       await this.$nextTick(() => {
         if (this.$refs.addrForm) {
-          this.$refs.addrForm.resetFields();
-          this.$refs.addrForm.clearValidate();
+          this.$refs.addrForm.resetFields()
+          this.$refs.addrForm.clearValidate()
         }
-        let list1 = this.project_list[index].order_good;
-        this.order_good = list1.length > 0 ? JSON.parse(JSON.stringify(list1)) : [];
+        const list1 = this.project_list[index].order_good
+        this.order_good = list1.length > 0 ? JSON.parse(JSON.stringify(list1)) : []
 
-        this.order_good[0].good_img = this.order_good[0].good_img.split(",");
-        let list2 = this.project_list[index].order_addr;
+        this.order_good[0].good_img = this.order_good[0].good_img.split(',')
+        const list2 = this.project_list[index].order_addr
         this.addrForm.order_addr =
-          list2.length > 0 ? JSON.parse(JSON.stringify(list2)) : [];
-        this.sendtype = this.order_good[0].sendtype;
-      });
+          list2.length > 0 ? JSON.parse(JSON.stringify(list2)) : []
+        this.sendtype = this.order_good[0].sendtype
+      })
     },
     openHouseModal(index) {
-      let findex = this.addrForm.order_addr.findIndex((v) => v.edit === true);
+      const findex = this.addrForm.order_addr.findIndex((v) => v.edit === true)
       if (findex !== -1) {
-        this.$message.warning("当前已有地址在编辑,请保存后再试!");
-        return;
+        this.$message.warning('当前已有地址在编辑,请保存后再试!')
+        return
       } else {
         if (index === -1) {
           this.addrForm.order_addr.push({
             edit: true,
-            receipt_quantity: "",
-            contactor: "",
-            mobile: "",
+            receipt_quantity: '',
+            contactor: '',
+            mobile: '',
             addr_code: [],
-            addr: "",
-          });
+            addr: ''
+          })
         } else {
-          this.addrForm.order_addr[index].edit = true;
+          this.addrForm.order_addr[index].edit = true
         }
       }
     },
-    //省市区选择
+    // 省市区选择
     async select_area_change(e, index) {
-      this.addrForm.order_addr[index].addr_code = e;
-      const { addr_code } = this.addrForm.order_addr[index];
+      this.addrForm.order_addr[index].addr_code = e
+      const { addr_code } = this.addrForm.order_addr[index]
       if (addr_code && addr_code.length === 3) {
-        let arrCode = addr_code[addr_code.length - 1];
+        const arrCode = addr_code[addr_code.length - 1]
         // console.log(model);
-        let { code, data, message } = await asyncRequest.addrall({
-          code: arrCode,
-        });
+        const { code, data, message } = await asyncRequest.addrall({
+          code: arrCode
+        })
         if (code === 0) {
-          const { province, city, area } = data;
-          let province_name = province && province.name ? province.name : "";
-          let city_name = city && city.name ? city.name : "";
-          let area_name = area && area.name ? area.name : "";
+          const { province, city, area } = data
+          const province_name = province && province.name ? province.name : ''
+          const city_name = city && city.name ? city.name : ''
+          const area_name = area && area.name ? area.name : ''
           this.addrForm.order_addr[index].addr_code_name =
             province_name && city_name && area_name
               ? `${province_name}/${city_name}/${area_name}`
-              : "";
+              : ''
         } else if (code >= 100 && code <= 104) {
-          await this.logout();
+          await this.logout()
         } else {
-          this.$message.warning(message);
+          this.$message.warning(message)
         }
       } else {
-        this.addrForm.order_addr[index].addr_code_name = "";
+        this.addrForm.order_addr[index].addr_code_name = ''
       }
     },
-    //省市区保存某一行
+    // 省市区保存某一行
     checkRow(rowIndex) {
       this.$refs.addrForm.validate((valid) => {
         if (valid) {
-          this.addrForm.order_addr[rowIndex].edit = false;
+          this.addrForm.order_addr[rowIndex].edit = false
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
     // 省市区删除行操作
     deleteRow(index, rows) {
-      rows.splice(index, 1);
+      rows.splice(index, 1)
     },
     async submitForm() {
       if (this.loading) {
-        return;
+        return
       }
-      this.loading = true;
-      let model = {
+      this.loading = true
+      const model = {
         planNo: this.planNo,
         arrtime: this.arrtime,
-        planinfo: [],
-      };
+        planinfo: []
+      }
       this.project_list.forEach((e) => {
-        const { order_good, order_addr } = e;
+        const { order_good, order_addr } = e
 
-        const { id, sendtype } = JSON.parse(JSON.stringify(order_good[0]));
-        let modelA = {
-          feedback_id: id || "",
-          sendtype: sendtype || "2",
-          addrlist: [],
-        };
+        const { id, sendtype } = JSON.parse(JSON.stringify(order_good[0]))
+        const modelA = {
+          feedback_id: id || '',
+          sendtype: sendtype || '2',
+          addrlist: []
+        }
         order_addr.forEach((a) => {
-          let modelB = {
+          const modelB = {
             addr_code: a.addr_code.toString(),
             contactor: a.contactor,
             mobile: a.mobile,
             addr: a.addr,
-            receipt_quantity: a.receipt_quantity,
-          };
-          modelA.addrlist.push(modelB);
-        });
-        model.planinfo.push(modelA);
-      });
-      let res = await asyncRequest.project_place_order(model);
-      this.loading = false;
+            receipt_quantity: a.receipt_quantity
+          }
+          modelA.addrlist.push(modelB)
+        })
+        model.planinfo.push(modelA)
+      })
+      const res = await asyncRequest.project_place_order(model)
+      this.loading = false
       if (res && res.code === 0) {
         this.$notify.success({
-          title: "下单成功!",
-          message: "",
-        });
-        this.showModelThis = false;
+          title: '下单成功!',
+          message: ''
+        })
+        this.showModelThis = false
         // 刷新
-        this.$emit("refresh");
+        this.$emit('refresh')
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(res.message)
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

+ 4 - 4
src/views/sellOut/salesOrder/components/addForm.vue

@@ -327,10 +327,10 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="发货方式" prop="sendtype">
+              <el-form-item label="下单方式" prop="sendtype">
                 <el-select
                   v-model="ruleForm.sendtype"
-                  placeholder="发货方式"
+                  placeholder="下单方式"
                   style="width: 100%"
                 >
                   <el-option
@@ -779,11 +779,11 @@ export default {
       sendtype_options: [
         {
           value: "1",
-          label: "直接发货",
+          label: "有地址下单",
         },
         {
           value: "2",
-          label: "延时发货",
+          label: "无地址下单",
         },
       ],
       ruleForm: {

+ 4 - 4
src/views/sellOut/zixunOrder/components/buyGoodModal.vue

@@ -99,10 +99,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="5">
-                <el-form-item label="发货方式" prop="sendtype" label-width="90px">
+                <el-form-item label="下单方式" prop="sendtype" label-width="90px">
                   <el-select
                     v-model="ruleForm.sendtype"
-                    placeholder="发货方式"
+                    placeholder="下单方式"
                     style="width: 100%"
                   >
                     <el-option
@@ -676,11 +676,11 @@ export default {
       options: [
         {
           value: '1',
-          label: '直接发货'
+          label: '有地址下单'
         },
         {
           value: '2',
-          label: '延时发货'
+          label: '无地址下单'
         }
       ],
       stock_code: '',

+ 1 - 1
src/views/supplierSellOut/supplierSellOutOrder/columns.js

@@ -313,7 +313,7 @@ const rshowColumns = [
   },
   {
     prop: 'addtime',
-    label: '发货方式',
+    label: '添加时间',
     span: 6
   },
 

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików