商品管理新增编辑新增主单位

src/HDrpManagement/ProductMag/modules/add.vue

@@ -5,6 +5,7 @@
       <div class="drawer__panel" >
         <el-row :gutter="10">
           <el-form label-position="right" label-width="90px" :model="form" :rules="rules" ref="form" size="small">
+        <el-row>
             <el-col :span="12">
               <el-form-item label="品号" prop="itemno">
                 <el-input v-model="form.itemno" placeholder="输入品号"></el-input>
@@ -63,7 +64,7 @@
                 <el-input v-model="form.material" placeholder="输入基材"></el-input>
               </el-form-item>
             </el-col>
-            
+
             <el-col :span="12">
               <el-form-item prop="ismodule">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.ismodule">是否配件</el-checkbox>
@@ -128,6 +129,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="主单位" prop="unitid">
+                <el-select style="width:100%" v-model="form.unitid" placeholder="请选择" @change="unitChange">
+                  <el-option
+                      v-for="item in unitData"
+                      :key="item.unitid"
+                      :label="item.unitname"
+                      :value="item.unitid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="起订量" prop="orderminqty" style="height:51px">
                 <el-input placeholder="起订量" v-model="form.orderminqty" @blur="(form.orderminqty<0?form.orderminqty = 1:'')" class="input-with-select">
@@ -148,21 +161,25 @@
                 </el-input>
               </el-form-item>
             </el-col>
+        </el-row>
             <!-- <el-col :span="8">
               <el-form-item label="交期">
                 <el-input v-model="form.delivery" placeholder="输入交期(天)"></el-input>
               </el-form-item>
             </el-col> -->
-            <el-col :span="8">
-              <el-form-item label="保修期限">
-                <el-input v-model="form.warrantyday" placeholder="输入保修期限(年)"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="营销物料">
-                <el-checkbox :true-label="1" :false-label="0" v-model="form.iswuliao">是否物料</el-checkbox>
-              </el-form-item>
-            </el-col>
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="保修期限">
+                  <el-input v-model="form.warrantyday" placeholder="输入保修期限(年)"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="营销物料">
+                  <el-checkbox :true-label="1" :false-label="0" v-model="form.iswuliao">是否物料</el-checkbox>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
             <el-col :span="24">
               <el-form-item label="特殊说明">
                 <el-input v-model="form.specalnote" type="textarea" placeholder="输入特殊说明"></el-input>
@@ -194,6 +211,7 @@
                 <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
               </el-form-item>
             </el-col>
+            </el-row>
           </el-form>
 
         </el-row>
@@ -291,7 +309,7 @@ export default {
       spacList:[],
       customizedlist:[],
       delisting:[],
-      financialclassification:[]
+      financialclassification:[],
     }
   },
   methods:{
@@ -315,7 +333,7 @@ export default {
       const res = await this.$store.dispatch('optiontypeselect','productcolorlist')
       this.productColorList = res.data
     },
-    
+
     async financial () {
       const res = await this.$store.dispatch('optiontypeselect','financialclassification')
       this.financialclassification = res.data
@@ -372,6 +390,7 @@ export default {
       this.customizedlist = res.data
     },
     onSubmit () {
+      console.log(this.form,'form')
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({
@@ -393,7 +412,7 @@ export default {
           this.$router.push({path:'/productmagDetail',query:{id:res.data.itemid,rowindex:res.data.rowindex}})
         })
       })
-      
+
     },
     onCancel(){
       this.dialogFormVisible = false
@@ -477,10 +496,10 @@ export default {
     }
   },
   mounted () {
-    
+
   }
 }
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -5,6 +5,7 @@
       <div class="drawer__panel" >
         <el-row :gutter="10">
           <el-form label-position="right" label-width="90px" :model="form" :rules="rules" ref="form" size="small">
+            <el-row>
             <el-col :span="12">
               <el-form-item label="品号" prop="itemno">
                 <el-input v-model="form.itemno" placeholder="输入品号"></el-input>
@@ -130,6 +131,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="主单位" prop="unitid">
+                <el-select style="width:100%" v-model="form.unitid" placeholder="请选择" @change="unitChange">
+                  <el-option
+                      v-for="item in unitData"
+                      :key="item.unitid"
+                      :label="item.unitname"
+                      :value="item.unitid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="起订量" prop="orderminqty" style="height:51px">
                 <el-input placeholder="起订量" v-model="form.orderminqty" class="input-with-select">
@@ -150,22 +163,26 @@
                 </el-input>
               </el-form-item>
             </el-col>
+            </el-row>
             <!-- <el-col :span="8">
               <el-form-item label="交期">
                 <el-input v-model="form.delivery" placeholder="输入交期(天)"></el-input>
               </el-form-item>
             </el-col> -->
-            <el-col :span="8">
+            <el-row>
+            <el-col :span="12">
               <el-form-item label="保修期限">
                 <el-input v-model="form.warrantyday" placeholder="输入保修期限(年)"></el-input>
               </el-form-item>
             </el-col>
-            
-            <el-col :span="8">
+
+            <el-col :span="12">
               <el-form-item label="营销物料">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.iswuliao">是否物料</el-checkbox>
               </el-form-item>
             </el-col>
+            </el-row>
+            <el-row>
             <el-col :span="24">
               <el-form-item label="特殊说明">
                 <el-input v-model="form.specalnote" type="textarea" placeholder="输入特殊说明"></el-input>
@@ -197,6 +214,7 @@
                 <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
               </el-form-item>
             </el-col>
+            </el-row>
           </el-form>
 
         </el-row>
@@ -215,7 +233,7 @@ import previewImage from '@/components/previewImage/index.vue'
 export default {
   components:{uploadFile,previewImage},
   props:['data'],
-  
+
   data () {
     // this.form.orderminqty == 0?this.form.orderminqty = 1:''
     // this.form.orderaddqty == 0?this.form.orderaddqty = 1:''
@@ -338,6 +356,7 @@ export default {
         },
       })
       this.form = Object.assign({}, this.form, res.data)
+      this.form.unitid = this.form.unitid == '0' ? '':this.form.unitid
       this.form.tradefields = this.form.tradefield.map(e => {
         return e.tradefield
       })
@@ -430,7 +449,7 @@ export default {
           this.$router.push({path:'/productmagDetail',query:{id:res.data.itemid,rowindex:res.data.rowindex}})
         })
       })
-      
+
     },
     onCancel(){
       this.dialogFormVisible = false
@@ -513,10 +532,10 @@ export default {
     }
   },
   mounted () {
-    
+
   }
 }
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/productStore/index.vue

@@ -31,7 +31,16 @@
           <el-form-item label="经销商信息">
              <el-input v-model="agentinfo" placeholder="输入经销商信息"></el-input>
           </el-form-item>
-
+          <el-form-item label="是否上架">
+            <el-select class="inline-24" v-model="isonsale" placeholder="请选择是否上架"  size="small" clearable>
+              <el-option
+                  v-for="item in isOnSaleData"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="onSubmit(false)">查询</el-button>
             <!-- <el-button type="primary" @click="onSubmit(true)">一键查询全部</el-button> -->
@@ -78,6 +87,17 @@ export default {
       itemname:'',
       itemclassids:[],
       classOptions:[],
+      isonsale:'',
+      isOnSaleData:[
+        {
+          value:1,
+          label:'是'
+        },
+        {
+          value:0,
+          label:'否'
+        },
+      ],
     }
   },
   async created () {
@@ -99,7 +119,7 @@ export default {
     },
     onSubmit () {
       let bool = false
-      if (this.itemname == '' && this.itemclassids.length == 0 && this.iteminfo == '' && this.agentinfo == '') {
+      if (this.itemname == '' && this.itemclassids.length == 0 && this.iteminfo == '' && this.agentinfo == '' ) {
         bool = true
       }
       this.$refs['list'].param.content = {
@@ -109,6 +129,7 @@ export default {
         "pageSize":100,
         "all":bool,
         "where":{
+          'isonsale':this.isonsale
         }
       }
       this.$refs['list'].listData()

src/style/style.css

@@ -180,7 +180,7 @@ ul{
   color:#666;
 }
 .el-drawer__wrapper{
-  right:60px !important;
+  right:10px !important;
 }
 
 .fixed__btn__panel{
@@ -228,4 +228,4 @@ ul{
   color:#3874F6;
   text-decoration: underline;
   cursor: pointer;
-}
+}