build

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -445,8 +445,8 @@ export default {
         };
         this.returnItem = this.resModel;
 
-        if(e === 0){
-          MessageBox.confirm('是否确定无地址退货').then(() => this.returnModel = true).catch(() => {})
+        if(e === 0 && this.multipleSelection.length !== 0){
+          MessageBox.confirm('是否确认无地址退货?').then(() => this.returnModel = true).catch(() => {})
         } else {
           this.returnModel = true
         }

src/views/sellOut/sellOutOrder/columns.js

@@ -30,17 +30,17 @@ const columns = [
     label: '申请人部门',
     minWidth: '150px'
   },
-  {
-    prop: 'wsm_supplier',
-    label: '供应商',
-    minWidth: '150px'
-  },
 
   // {
   //   prop: "orderCode",
   //   label: "销售订单编号",
   //   width: "160"
   // },
+  {
+    prop: 'send_num',
+    label: '发货数量',
+    span: 6
+  },
   {
     prop: 'status',
     label: '状态',
@@ -60,9 +60,9 @@ const columns = [
     width: '85'
   },
   {
-    prop: 'send_num',
-    label: '发货数量',
-    width: '80px'
+    prop: 'wsm_supplier',
+    label: '供应商',
+    minWidth: '150px'
   },
   {
     prop: 'good_class',
@@ -184,11 +184,6 @@ const showColumns = [
     span: 6
   },
 
-  {
-    prop: 'send_num',
-    label: '发货数量',
-    span: 6
-  },
   {
     prop: 'check_num',
     label: '验收数量',

src/views/supplierPurchaseIn/supplierWorkbench/components/baseForm.vue

@@ -35,8 +35,8 @@
             :placeholder="'供应商'"
             :size="'mini'"
             :names="supplierNo_name"
-            :disabled="type === 'view'"
-            :isDetail="type !== 'add'"
+            disabled
+            :isDetail="true"
             @searchChange="supplierNosearchChange"
           />
         </el-form-item>
@@ -708,6 +708,7 @@ export default {
       rulesThis: this.rules,
       activeName: "1",
       loading: true,
+      supplierNo_name:"",
 
       //新实时金价
       newGoldPrice: 0,
@@ -762,6 +763,12 @@ export default {
       if (this.type === "edit" || this.type === "view") {
         await this.initData();
       }
+
+      if(this.type === 'add'){
+        this.ruleForm.supplierNo = [this.currentCompany]
+        this.supplierNo_name = this.getCompanyWithCode(this.currentCompany).name
+      }
+      
       //调用实时金价获取接口
       this.golpricelast();
       //调用成本合算计算函数
@@ -869,7 +876,8 @@ export default {
             this.cat_id_name += `${ei !== 0 ? "_" : ""}${e.name}`;
           });
         }
-        this.supplierNo_name = supplierName || "";
+
+        this.supplierNo_name =  supplierName || "";
         this.is_noble = is_gold_price === "1" && this.pid === "6";
         // this.is_noble = this.askItem.is_metal;
         this.brand_name = brand_name || "";
@@ -1075,7 +1083,6 @@ export default {
 
           if (this.type === "add") {
             this.spec_tableData = JSON.parse(JSON.stringify(this.askItem.specinfo));
-            this.ruleForm.supplierNo = [this.currentCompany]
           }
           await this.set_must_spec();
         }

src/views/supplierPurchaseIn/supplierWorkbench/components/baseFormAddEdit.vue

@@ -11,8 +11,8 @@
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
-    @close="showModelThis = false"
     append-to-body
+    @close="showModelThis = false"
   >
     <el-card style="margin: -20px 0 0 0">
       <el-row :gutter="10">
@@ -31,7 +31,7 @@
                 :value="ruleForm.specid"
                 :disabled="sitem.isMust"
                 :size="'mini'"
-                :isDetail="false"
+                :is-detail="false"
                 :placeholder="'规格类型'"
                 @searchChange="specidsearchChange"
               />
@@ -39,29 +39,28 @@
             <el-form-item label="规格值" prop="spec_value_id">
               <div v-if="specVlist.length > 0">
                 <el-select
-                  placeholder="请选择规格值"
                   v-model="ruleForm.spec_value_id"
-                  @change="spec_value_id_change"
+                  placeholder="请选择规格值"
                   style="width: 100%"
                   filterable
+                  @change="spec_value_id_change"
                 >
                   <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
                     :label="item.spec_value"
                     :value="item.id"
-                    >{{ item.spec_value }}</el-option
-                  >
+                  >{{ item.spec_value }}</el-option>
                 </el-select>
               </div>
-              <div class="no-data" v-else>暂无规格值,请添加！</div>
+              <div v-else class="no-data">暂无规格值,请添加！</div>
             </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
           <el-input
-            style="width: 209px"
             v-model="sinput"
+            style="width: 209px"
             class="fl"
             :disabled="id == 'edit'"
             :size="'small'"
@@ -72,18 +71,17 @@
             style="margin: 0 0 0 10px"
             icon="el-icon-plus"
             :size="'small'"
-            @click="add_spec"
             class="fl"
-            >新增规格值</el-button
-          >
+            @click="add_spec"
+          >新增规格值</el-button>
           <el-button
             v-if="id !== 'edit'"
             :size="'small'"
             type="primary"
             @click="submitForm"
-            >保 存
+          >保 存
           </el-button>
-          <el-button @click="showModelThis = false" :size="'small'">{{
+          <el-button :size="'small'" @click="showModelThis = false">{{
             id == "edit" ? "关 闭" : "取 消"
           }}</el-button>
         </el-col>
@@ -92,17 +90,17 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/goodStore/goodsCost";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/goodStore/goodsCost'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "brand",
-  props: ["showModel", "index", "sitem"],
+  name: 'Brand',
   mixins: [resToken],
+  props: ['showModel', 'index', 'sitem'],
   data() {
     return {
       loading: false,
-      title: "商品规格",
-      sinput: "",
+      title: '商品规格',
+      sinput: '',
       showModelThis: this.showModel,
       specVlist: [],
       ruleForm: {},
@@ -112,144 +110,144 @@ export default {
         specid: [
           {
             required: true,
-            message: "规格类型不能为空",
-            trigger: "change",
-          },
+            message: '规格类型不能为空',
+            trigger: 'change'
+          }
         ],
-        spec_value_id: [{ required: true, message: "请选择规格值", trigger: "change" }],
-      },
-    };
+        spec_value_id: [{ required: true, message: '请选择规格值', trigger: 'change' }]
+      }
+    }
   },
   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: {
     async initForm() {
-      this.loading = true;
-      this.resetFormData();
-      this.rulesThis = this.rules;
-      if (this.index + "" === "-1") {
-        this.title = "添加商品规格值";
+      this.loading = true
+      this.resetFormData()
+      this.rulesThis = this.rules
+      if (this.index + '' === '-1') {
+        this.title = '添加商品规格值'
       } else {
-        this.title = "修改商品规格值";
+        this.title = '修改商品规格值'
       }
-      await this.resetForm();
-      this.loading = false;
+      await this.resetForm()
+      this.loading = false
     },
     async resetForm() {
       // 重置
-      await this.$nextTick(async () => {
+      await this.$nextTick(async() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          if (this.index + "" !== "-1") {
-            this.specVlist = [];
-            const { specid, spec_name, spec_value_id, spec_value_name } = this.sitem;
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          if (this.index + '' !== '-1') {
+            this.specVlist = []
+            const { specid, spec_name, spec_value_id, spec_value_name } = this.sitem
             this.ruleForm = {
               index: this.index,
-              specid: specid || "",
-              spec_name: spec_name || "",
-              spec_value_id: spec_value_id || "",
-              spec_value_name: spec_value_name || "",
-            };
-            await this.getlist();
-            console.log(this.ruleForm);
+              specid: specid || '',
+              spec_name: spec_name || '',
+              spec_value_id: spec_value_id || '',
+              spec_value_name: spec_value_name || ''
+            }
+            await this.getlist()
+            console.log(this.ruleForm)
           }
         }
-      });
+      })
     },
     resetFormData() {
-      this.specVlist = [];
+      this.specVlist = []
       this.ruleForm = {
-        index: "-1",
-        specid: "",
-        spec_name: "",
-        spec_value_id: "",
-        spec_value_name: "",
-      };
+        index: '-1',
+        specid: '',
+        spec_name: '',
+        spec_value_id: '',
+        spec_value_name: ''
+      }
     },
     async add_spec() {
-      const { specid } = this.ruleForm;
+      const { specid } = this.ruleForm
       if (specid) {
         if (this.sinput) {
           const { code, data, message } = await asyncRequest.valueadd({
             spec_id: specid,
-            spec_value: this.sinput,
-          });
+            spec_value: this.sinput
+          })
           if (code === 0) {
-            await this.getlist();
+            await this.getlist()
           } else if (code >= 100 && code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(message);
+            this.$message.warning(message)
           }
         } else {
-          this.$message.warning("请输入规格值！");
+          this.$message.warning('请输入规格值！')
         }
       } else {
-        this.$message.warning("请选择规格类型！");
+        this.$message.warning('请选择规格类型！')
       }
     },
     async specidsearchChange(e) {
-      const { id, spec_name } = e;
-      this.ruleForm.specid = id || "";
-      this.ruleForm.spec_name = spec_name || "";
-      this.$refs.ruleForm.validateField("specid");
-      await this.getlist();
+      const { id, spec_name } = e
+      this.ruleForm.specid = id || ''
+      this.ruleForm.spec_name = spec_name || ''
+      this.$refs.ruleForm.validateField('specid')
+      await this.getlist()
     },
     spec_value_id_change(e) {
       if (e) {
-        const { id, spec_value } = this.specVlist.find((i) => i.id === e);
-        this.ruleForm.spec_value_id = id || "";
-        this.ruleForm.spec_value_name = spec_value || "";
+        const { id, spec_value } = this.specVlist.find((i) => i.id === e)
+        this.ruleForm.spec_value_id = id || ''
+        this.ruleForm.spec_value_name = spec_value || ''
       } else {
-        this.ruleForm.spec_value_id = "";
-        this.ruleForm.spec_value_name = "";
+        this.ruleForm.spec_value_id = ''
+        this.ruleForm.spec_value_name = ''
       }
-      this.$refs.ruleForm.validateField("spec_value_id");
+      this.$refs.ruleForm.validateField('spec_value_id')
     },
     async getlist() {
-      const { specid } = this.ruleForm;
+      const { specid } = this.ruleForm
       if (specid) {
         const { code, data, message } = await asyncRequest.valueall({
-          spec_id: specid,
-        });
+          spec_id: specid
+        })
         if (code === 0) {
-          this.specVlist = data;
+          this.specVlist = data
         } else if (code >= 100 && code <= 104) {
-          await this.logout();
+          await this.logout()
         } else {
-          this.$message.warning(message);
+          this.$message.warning(message)
         }
       } else {
-        this.specVlist = [];
+        this.specVlist = []
       }
     },
 
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
-          this.showModelThis = false;
-          console.log(this.ruleForm);
-          this.$emit("refresh", this.ruleForm);
+          this.showModelThis = false
+          console.log(this.ruleForm)
+          this.$emit('refresh', this.ruleForm)
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -21,12 +21,6 @@ const columns = [
     _slot_: 'status',
     width: '120px'
   },
-  {
-    prop: 'has_account',
-    label: '供应商端',
-    _slot_: 'has_account',
-    width: '0px'
-  },
   // {
   //   prop: 'order_source',
   //   label: '订单来源',

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -279,7 +279,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('sellAfterApplyDetail', { id: scope.row.returnCode })"
+              @click="routeGoto('supplierSellAfterApplyDetail', { id: scope.row.returnCode })"
             ></i>
           </el-tooltip>
         </template>