2023-2-18

src/HDrpManagement/BrandManage/component/saleclass/components/edit.vue

@@ -87,6 +87,8 @@ export default {
                 "parentid":this.rowData.itemclassid === undefined ? 0 : this.rowData.itemclassid,
                 "itemclassnum":this.ruleForm.itemclassnum,
                 "itemclassname":this.ruleForm.itemclassname,
+                "istool":this.ruleForm.istool,
+                "ishide":this.ruleForm.ishide,
                 "num":this.ruleForm.num,
                 "classtype":"营销"
             }

src/HDrpManagement/ProductGroupMag/index.vue

@@ -33,8 +33,11 @@
           <span v-if="scope.data.column.data[scope.data.column.columnname] == 0" style="color:red">未上架</span>
           <span v-if="scope.data.column.data[scope.data.column.columnname] == 1" style="color:rgb(82, 196, 26)">已上架</span>
         </div>
+        <div v-if="scope.data.column.columnname == 'sequence'">
+          {{scope.data.column.data.sequence + 1}}
+        </div>
         <div v-else>
-          {{scope.data.column.data[scope.data.column.columnname]}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
       <template v-slot:tbOpreation="scope">

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -19,6 +19,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="序号:" prop="sequence">
+                <el-input type="text" size="small" v-model="form.sequence"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <p class="normal-title normal-margin">
                 添加产品 
@@ -60,7 +65,8 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
-        tag: []
+        tag: [],
+        sequence:''
       },
       rules: {
         sa_brandid: [
@@ -112,6 +118,7 @@ export default {
           "sa_brandid":this.form.sa_brandid,
           "groupname":this.form.groupname,
           "itemno":"",
+          "sequence":this.form.sequence,
           "tag": []
         }
       })

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -13,6 +13,7 @@
         @onEditSuccess="queryMainData($route.query.id)"
         :statusCheck="[{key:'isonsale',value:1}]">
       <div slot="customOperation">
+        <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData"/>
         <shelves class="inline-16" @upSuccess="queryMainData" :data="mainData"></shelves>
       </div>
       <div slot="slot0" >

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -1,7 +1,8 @@
 <template>
-  <div >
-    <el-button size="mini" @click="editBtn" :disabled="!!disabled">编 辑</el-button>
-    <el-dialog title="编辑商品组" :visible.sync="dialogTableVisible" width="30%" direction="rtl" append-to-body>
+  <div>
+    <el-button type="primary" size="mini" @click="editBtn">编 辑</el-button>
+    <el-drawer title="编辑商品组" :visible.sync="drawer" size="40%" direction="rtl" append-to-body @close="onCancel">
+      <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
             <el-col :span="24">
@@ -11,67 +12,46 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="品牌:" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" @change="getProductList(params.content.pageNumber = 1,$refs.table.allArr=[])" style="width: 100%">
-                  <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%" :disabled="true">
+                  <el-option v-for="item in brandList" :key="item.sa_brandid" :label="item.brandname"
                              :value="item.sa_brandid" size="small">
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
-             <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
-              <label class="inline-16" style="font-size: 14px">可选商品:</label>
-              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @input="queryClick" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px;float: right" size="small" class="input-with-select inline-16" clearable>
-              </el-input>
             </el-col>
             <el-col :span="24">
-              <Table ref="table" v-model="form.itemno" :layout="tablecols" :data="productList" :custom="false" height="500px"  @upDateData="upDateData">
-              </Table>
-              <div class="container normal-panel" style="text-align:right">
-                <el-pagination
-                    style="text-align:right"
-                    background
-                    small
-                    @size-change="handleSizeChange"
-                    @current-change="handleCurrentChange"
-                    :current-page="params.content.pageNumber"
-                    :page-sizes="[20, 50, 100, 200]"
-                    layout="total,sizes, prev, pager, next, jumper"
-                    :total="total">
-                </el-pagination>
-              </div>
+              <el-form-item label="序号:" prop="sequence">
+                <el-input type="text" size="small" v-model="form.sequence"></el-input>
+              </el-form-item>
             </el-col>
           </el-form>
         </el-row>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogTableVisible = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="submit">确 定</el-button>
       </div>
-    </el-dialog>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
-import Table from './table'
 export default {
-  components:{Table},
+  props: ['data', 'type'],
   data () {
     return {
-      dialogTableVisible:false,
-      /* 当前选择的组 */
-      seleteGroup:'',
-      inputVisible: false,
-      inputValue: '',
-      productList:[],
-      tablecols:[],
-      total:0,
-      search:'',
-      form:{
-        sa_brandid:'',
-        groupname:'',
-        itemno:'',
-        tag:[]
+      drawer:false,
+      col:0,
+      tableData:[],
+      brandList:[],
+      form: {
+        sa_brandid: '',
+        groupname: '',
+        itemno: '',
+        tag: [],
+        sequence:''
       },
-      rules:{
+      rules: {
         sa_brandid: [
           { required: true, message: '请选择品牌', trigger: 'blur' },
         ],
@@ -81,155 +61,94 @@ export default {
         itemno: [
           { required: true, message: '请选择商品', trigger: 'blur' },
         ]
-      },
-      params: {
-        "id": "20220923112503",
-        "version":1,
-        "content": {
-          "nocache":true,
-          "sa_itemgroupid":"",
-          "pageNumber":1,
-          "pageSize":20,
-          "where":{
-            "condition":""
-          }
-        }
       }
     }
-  },
-  props:['data','disabled'],
-  inject:['productList','brandList'],
-  watch: {
-    
   },
   created () {
-    this.tablecols = this.tool.tabelCol(this.$route.name)['addProductTable'].tablecols
-    if (this.brandList()) {
-      this.form.sa_brandid = this.brandList()[0].sa_brandid
-    }
-    console.log(this.brandList());
-
-    this.getProductList()
+    this.getBrandList()
   },
   methods: {
-    submit() {
-      this.$refs.form.validate(async val => {
-        if(val) {
-          let res = await this.$api.requested({
-            "id": "20220922164303",
-            "version":1,
-            "content": {
-                "sa_itemgroupid":this.data.sa_itemgroupid,    
-                "sa_brandid":this.form.sa_brandid,
-                "groupname":this.form.groupname,
-                "itemno":this.form.itemno,
-                "tag": this.form.tag
-            }
-          })
-          this.tool.showMessage(res,() => {
-            this.$emit('onSuccess')
-            this.$refs.form.resetFields()
-            this.dialogTableVisible = false
-          })
-        }
-      })
-    },
-    editBtn() {      
-      this.dialogTableVisible = true
-      this.seleteGroup = this.data
-      let temp = JSON.parse(JSON.stringify(this.seleteGroup))
-      this.form = {
-        sa_brandid:temp.sa_brandid,
-        groupname:temp.groupname,
-        itemno:temp.itemno,
-        tag:temp.tag1
-      }
-      console.log(this.form);
-      
-    },
-    handleClose(tag) {
-      this.form.tag.splice(this.form.tag.indexOf(tag), 1);
-    },
-    showInput() {
-      this.inputVisible = true;
-      this.$nextTick(_ => {
-        this.$refs.saveTagInput.$refs.input.focus();
-      });
-    },
-    handleInputConfirm() {
-      let inputValue = this.inputValue;
-      if (inputValue) {
-        this.form.tag.push(inputValue);
-      }
-      this.inputVisible = false;
-      this.inputValue = '';
+    editBtn () {
+      this.drawer=true
+      this.form = Object.assign({},this.form,this.data)
     },
-    upDateData (data) {
-      if (data.length == 0) {
-        this.form.itemno = ''
-      } {
-        this.form.itemno = true
-      }
+    onCancel(){
+      this.drawer = false
+      this.form={
+        sa_brandid: '',
+        groupname: '',
+        itemno: '',
+        tag: []
+      },
+      this.tableData = []
     },
-    /* 可选择的商品列表 */
-    async getProductList() {
-      this.params.content.sa_brandid = this.form.sa_brandid
-      let res = await this.$api.requested(this.params)
-      this.productList = res.data
-      this.total = res.total
-      console.log(this.productList,'商品');
+    addProduct (row) {
+      this.tableData.push(row)
+      const res = new Map();
+      this.tableData = this.tableData.filter((item) => !res.has(item['itemid']) && res.set(item['itemid'], 1));
     },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.params.content.pageSize = val
-      this.getProductList()
+    deleteProduct (row) {
+      this.tableData = this.tableData.filter(e=>{
+        return e.itemid !== row.itemid
+      })
     },
-    handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
-      this.params.content.pageNumber = val
-      this.getProductList()
+    async submit() {
+      const res = await this.$api.requested({
+        "id": "20220922164303",
+        "content": this.form
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+        this.drawer = false
+      })
     },
-    clearData(){
-      this.search = ""
+    /* 可选择的品牌列表 */
+    async getBrandList() {
+      let res = await this.$api.requested({
+        "id": "20220922085103",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      this.brandList = res.data
+      console.log(this.brandList,'品牌');
     },
-    queryClick(){
-      this.params.content.where.condition = this.search
-      this.getProductList()
+    async onSuccess () {
+      const res = await this.$api.requested({
+        "id": "20220922164303",
+        "content": {
+          "sa_itemgroupid":this.groupdata.sa_itemgroupid,     //sa_itemgroupid<=0时 为新增
+          "sa_brandid":this.groupdata.sa_brandid,
+          "groupname":this.groupdata.groupname,
+          "itemno":this.tableData[0].itemno,
+          "tag": []
+        }
+      })
+      this.$emit('onSuccess')
+      this.drawer = false
+      
     }
   }
 }
 
 </script>
 <style scoped>
-/deep/.el-dialog__body {
-  padding-top: 10px !important;
-  padding-bottom: 0 !important;
-}
-/deep/.dialog-footer {
-  margin-top: 10px !important;
-}
-/deep/.el-form-item__content {
-  width: calc(100% - 100px) !important;
-}
-/deep/.el-select {
-  width: 100% !important;
+.dialog-footer {
+  margin-top: 32px;
+  text-align: center;
 }
 /deep/.el-form-item {
-  width: 100% !important;
+  width: 100%;
 }
-.el-tag + .el-tag {
-  margin-left: 10px;
-  margin-bottom: 10px;
-}
-.button-new-tag {
-  margin-left: 10px;
-  height: 32px;
-  line-height: 30px;
-  padding-top: 0;
-  padding-bottom: 0;
+/deep/.el-form-item__content {
+  width: calc(100% - 100px);
 }
-.input-new-tag {
-  width: 90px;
-  margin-left: 10px;
+/deep/.el-pagination {
+  text-align: center;
+  margin-top: 10px;
 }
 </style>

src/HDrpManagement/ProductGroupMag/modules/editHeader.vue

@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <el-button type="primary" size="mini" @click="editBtn">编 辑</el-button>
+    <el-drawer title="编辑商品组" :visible.sync="drawer" size="80%" direction="rtl" append-to-body @close="onCancel">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
+            <el-col :span="8">
+              <el-form-item label="商品组名称:" prop="groupname">
+                <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="品牌:" prop="sa_brandid">
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%" :disabled="true">
+                  <el-option v-for="item in brandList" :key="item.sa_brandid" :label="item.brandname"
+                             :value="item.sa_brandid" size="small">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="序号:" prop="sequence">
+                <el-input type="text" size="small" v-model="form.sequence"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['data', 'type'],
+  data () {
+    return {
+      drawer:false,
+      col:0,
+      tableData:[],
+      brandList:[],
+      form: {
+        sa_brandid: '',
+        groupname: '',
+        itemno: '',
+        tag: [],
+        sequence:''
+      },
+      rules: {
+        sa_brandid: [
+          { required: true, message: '请选择品牌', trigger: 'blur' },
+        ],
+        groupname: [
+          { required: true, message: '请输入商品组名称', trigger: 'blur' },
+        ],
+        itemno: [
+          { required: true, message: '请选择商品', trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  created () {
+    this.getBrandList()
+  },
+  methods: {
+    editBtn () {
+      this.drawer=true
+      this.form = Object.assign({},this.form,this.data)
+    },
+    onCancel(){
+      this.drawer = false
+      this.form={
+        sa_brandid: '',
+        groupname: '',
+        itemno: '',
+        tag: []
+      },
+      this.tableData = []
+    },
+    addProduct (row) {
+      this.tableData.push(row)
+      const res = new Map();
+      this.tableData = this.tableData.filter((item) => !res.has(item['itemid']) && res.set(item['itemid'], 1));
+    },
+    deleteProduct (row) {
+      this.tableData = this.tableData.filter(e=>{
+        return e.itemid !== row.itemid
+      })
+    },
+    async submit() {
+      if (this.tableData.length === 0) 
+      const res = await this.$api.requested({
+        "id": "20220922164303",
+        "content": {
+          "sa_itemgroupid":0,     //sa_itemgroupid<=0时 为新增
+          "sa_brandid":this.form.sa_brandid,
+          "groupname":this.form.groupname,
+          "itemno":"",
+          "sequence":this.form.sequence,
+          "tag": []
+        }
+      })
+    },
+    /* 可选择的品牌列表 */
+    async getBrandList() {
+      let res = await this.$api.requested({
+        "id": "20220922085103",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      this.brandList = res.data
+      console.log(this.brandList,'品牌');
+    },
+    async onSuccess () {
+      const res = await this.$api.requested({
+        "id": "20220922164303",
+        "content": {
+          "sa_itemgroupid":this.groupdata.sa_itemgroupid,     //sa_itemgroupid<=0时 为新增
+          "sa_brandid":this.groupdata.sa_brandid,
+          "groupname":this.groupdata.groupname,
+          "itemno":this.tableData[0].itemno,
+          "tag": []
+        }
+      })
+      this.$emit('onSuccess')
+      this.drawer = false
+      
+    }
+  }
+}
+
+</script>
+<style scoped>
+.dialog-footer {
+  margin-top: 32px;
+  text-align: center;
+}
+/deep/.el-form-item {
+  width: 100%;
+}
+/deep/.el-form-item__content {
+  width: calc(100% - 100px);
+}
+/deep/.el-pagination {
+  text-align: center;
+  margin-top: 10px;
+}
+</style>

src/HDrpManagement/ProductMag/detail/index.vue

@@ -39,6 +39,28 @@
           class="inline-16"
           v-if="tool.checkAuth($route.name,'toExamine') && mainData.status == '审核'"
         />
+        <customBtn 
+          btnName="上架"
+          message="确认上架当前商品吗?"
+          idName="20220923154802"
+          keyName="itemids"
+          :id="[$route.query.id]"
+          :paramData="[{key:'isonsale',value:1}]"
+          @onSuccess="queryMainData($route.query.id)"
+          class="inline-16"
+          v-if="tool.checkAuth($route.name,'isTop') && mainData.isonsale == 0"
+        />
+        <customBtn 
+          btnName="下架"
+          message="确认下架当前商品吗?"
+          idName="20220923154802"
+          keyName="itemids"
+          :id="[$route.query.id]"
+          :paramData="[{key:'isonsale',value:0}]"
+          @onSuccess="queryMainData($route.query.id)"
+          class="inline-16"
+          v-if="tool.checkAuth($route.name,'isBottom') && mainData.isonsale == 1"
+        />
       </div>
       <div slot="slot0" >
         <detail_data :basic="mainData"></detail_data>
@@ -149,6 +171,18 @@ export default {
           label:'牌价',
           value:this.mainData.marketprice
         },
+        {
+          label:'领域',
+          value:this.mainData.tradefield.map(item => item.tradefield).join(',')
+        },
+        {
+          label:'上/下架',
+          value:this.mainData.isonsale ? '是' : '否'
+        },
+        {
+          label:'是否工具',
+          value:this.mainData.istool ? '是' : '否'
+        },
       ]
     },
   },

src/HDrpManagement/ProductMag/index.vue

@@ -161,8 +161,24 @@ export default {
   },
   methods:{
     async isOnSaleChange(val){
-      console.log("更改状态",val.isonsale)
-      console.log(val)
+      if (val.isonsale) {
+        if(!this.tool.checkAuth(this.$route.name,'isTop')) {
+          return this.$message({
+            title:'提示',
+            message:'暂无上架权限',
+            type:'warning'
+          })
+        }
+      }
+      if (!val.isonsale) {
+        if(!this.tool.checkAuth(this.$route.name,'isBottom')) {
+          return this.$message({
+            title:'提示',
+            message:'暂无下架权限',
+            type:'warning'
+          })
+        }
+      }
       const res = await this.$api.requested({
         "id": 20220923154802,
         "content": {

src/HDrpManagement/ProductMag/modules/add.vue

@@ -6,13 +6,13 @@
         <el-row :gutter="10">
           <el-form label-position="right" label-width="90px" :model="form" :rules="rules" ref="form" size="small">
             <el-col :span="12">
-              <el-form-item label="产品编号" prop="itemno">
-                <el-input v-model="form.itemno" placeholder="输入产品编号"></el-input>
+              <el-form-item label="品号" prop="itemno">
+                <el-input v-model="form.itemno" placeholder="输入品号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="产品名称" prop="itemname">
-                <el-input v-model="form.itemname"  placeholder="输入产品名称"></el-input>
+              <el-form-item label="品名" prop="itemname">
+                <el-input v-model="form.itemname"  placeholder="输入品名"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -57,7 +57,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="领域">
+              <el-form-item label="领域" prop="tradefield">
                 <el-select style="width:100%" v-model="form.tradefields" multiple placeholder="请选择" clearable>
                   <el-option
                     v-for="item in tradefield"
@@ -279,12 +279,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="ERP品名">
+              <el-form-item label="ERP品名" prop="erpitemname">
                 <el-input v-model="form.erpitemname" placeholder="输入ERP品名"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="ERP品号">
+              <el-form-item label="ERP品号" prop="erpitemno">
                 <el-input v-model="form.erpitemno" placeholder="输入ERP品号"></el-input>
               </el-form-item>
             </el-col>
@@ -355,8 +355,8 @@ export default {
         "itemname":'',
         "model": "",
         "spec": "",
-        "orderminqty": '', //订单起订量
-        "orderaddqty": '', //订单增量
+        "orderminqty": 1, //订单起订量
+        "orderaddqty": 1, //订单增量
         "orderminqty_auxunit": 0, //订单起订量控制单位（0:主单位；1:辅助单位）
         "orderaddqty_auxunit": 0, //订单增量控制单位（0:主单位；1:辅助单位
         "remarks": "", //可选
@@ -372,7 +372,7 @@ export default {
         "pressure": "", //可选,压力
         "material": "", //可选,材质
         "standards": "", //可选,产品标准
-        "tradefields": [], //可选,领域
+        "tradefields": '', //可选,领域
         "stockstatus2": 0, //可选,库存缺货标准
         "stockstatus1": 100, //可选,库存充足标准
         "warrantyday": 1, //可选,保修期（年）
@@ -406,7 +406,19 @@ export default {
         ],
         skucontrol: [
           { required: true,message:'单品管理不可为空', trigger:'change'}
-        ]
+        ],
+        unitid: [
+          { required: true,message:'请输入主单位', trigger:'change'}
+        ],
+        tradefields: [
+          { required: true,message:'请选择领域', trigger:'change'}
+        ],
+        erpitemno: [
+          { required: true,message:'请输入erp品号', trigger:'blur'}
+        ],
+        erpitemname: [
+          { required: true,message:'请输入erp品名', trigger:'blur'}
+        ],
       },
       unitGroupData:[],
       unitData:[],

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -1,17 +1,17 @@
 <template>
   <div>
-    <el-button type="default" size="mini" :disabled="data.status !== '新建'" @click="onShow(dialogFormVisible=true)" >编 辑</el-button>
+    <el-button type="primary" size="mini" :disabled="data.status !== '新建'" @click="onShow(dialogFormVisible=true)" >编 辑</el-button>
     <el-drawer append-to-body title="编辑产品" :visible.sync="dialogFormVisible" size="900px" @close="onCancel">
       <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-col :span="12">
-              <el-form-item label="产品编号" prop="itemno">
+              <el-form-item label="品号" prop="itemno">
                 <el-input v-model="form.itemno" placeholder="输入产品编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="产品名称" prop="itemname">
+              <el-form-item label="品名" prop="itemname">
                 <el-input v-model="form.itemname"  placeholder="输入产品名称"></el-input>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="领域">
+              <el-form-item label="领域" prop="tradefield">
                 <el-select style="width:100%" v-model="form.tradefields" multiple placeholder="请选择" clearable>
                   <el-option
                     v-for="item in tradefield"
@@ -279,12 +279,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="ERP品名">
+              <el-form-item label="ERP品名" prop="erpitemname">
                 <el-input v-model="form.erpitemname" placeholder="输入ERP品名"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="ERP品号">
+              <el-form-item label="ERP品号" prop="erpitemno">
                 <el-input v-model="form.erpitemno" placeholder="输入ERP品号"></el-input>
               </el-form-item>
             </el-col>
@@ -409,7 +409,19 @@ export default {
         ],
         skucontrol: [
           { required: true,message:'单品管理不可为空', trigger:'change'}
-        ]
+        ],
+        unitid: [
+          { required: true,message:'请输入主单位', trigger:'change'}
+        ],
+        tradefields: [
+          { required: true,message:'请选择领域', trigger:'change'}
+        ],
+        erpitemno: [
+          { required: true,message:'请输入erp品号', trigger:'blur'}
+        ],
+        erpitemname: [
+          { required: true,message:'请输入erp品名', trigger:'blur'}
+        ],
       },
       unitGroupData:[],
       unitData:[],

src/HDrpManagement/invoiceapp/index.vue

@@ -13,7 +13,7 @@
       :detailPath="{
         path:'/invoiceDetail'
       }"
-      >
+      @listData="list">
       <div slot="custom">
         <div class="mt-10">
           <label class="search__label">状态:</label>
@@ -52,6 +52,10 @@ export default {
     }
   },
   methods:{
+    list (data) {
+      console.log(data);
+      
+    },
     selectChange () {
       this.$refs['basicLayout'].param.content.where.status = this.status
       this.$refs['basicLayout'].param.content.pageNumber = 1

src/HDrpManagement/orderManage/modules/edit.vue

@@ -271,7 +271,9 @@ export default {
         }
       })
       this.receiveAddresslist = res.data
-      this.defaultData.re_info = res.data[0]
+      this.defaultData.re_info = res.data[0] ? res.data[0] : {}
+      console.log(res.data);
+      
     },
 
     // 账号信息

src/HDrpManagement/prodectFileData/components/add.vue

@@ -14,6 +14,9 @@
             <div v-if="scope.column.columnname === 'province'">
               <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
             </div>
+            <div v-else-if="scope.column.columnname === 'isonsale'">
+              <span>{{scope.column.data.isonsale ? '上架' : '下架'}}</span>
+            </div>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
 

src/HDrpManagement/servePeople/index.vue

@@ -41,7 +41,7 @@ export default {
   },
   methods:{
     list (param) {
-      param.content.where.isleader = 0
+      param.content.where.isleader = ''
     },
     listData (data) {
       console.log(data);

src/HManagement/marketing2/agent/details/modules/address/add.vue

@@ -3,7 +3,7 @@
     <el-button type="primary" size="small" @click="onShow(dialogFormVisible = true)">添加地址</el-button>
     <el-dialog title="新建地址" append-to-body :visible.sync="dialogFormVisible" width="800px">
       <el-row :gutter="20">
-        <el-form :model="form" ref="form" label-position="right" label-width="90px" size="small">
+        <el-form :model="form" ref="form" label-position="right" label-width="100px" size="small">
           <el-col :span="12">
             <el-form-item label="姓名" prop="name" :rules="[
               { required: true, message: '联系人姓名不能为空'},
@@ -81,6 +81,11 @@
               <el-input v-model="form.remarks" autocomplete="on" type="textarea" :rows="3" placeholder="输入联系人备注"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否默认地址">
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isdefault" ></el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -116,7 +121,8 @@ export default {
         "address":"",
         "remarks":"",
         "workaddress":1,
-        "value":[]
+        "value":[],
+        "isdefault":0
       }
     }
   },

src/HManagement/marketing2/agent/details/modules/address/edit.vue

@@ -3,7 +3,7 @@
     <el-button type="text" size="small" @click="onShow(dialogFormVisible = true)">编 辑</el-button>
     <el-dialog title="新建联系人" :visible.sync="dialogFormVisible" append-to-body width="50%">
       <el-row :gutter="20">
-        <el-form :model="form" ref="form" label-position="right" label-width="90px" size="small">
+        <el-form :model="form" ref="form" label-position="right" label-width="100px" size="small">
           <el-col :span="12">
             <el-form-item label="姓名" prop="name" :rules="[
               { required: true, message: '联系人姓名不能为空'},
@@ -81,6 +81,11 @@
               <el-input v-model="form.remarks" autocomplete="on" type="textarea" :rows="3" placeholder="输入联系人备注"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否默认地址">
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isdefault" ></el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -116,7 +121,8 @@ export default {
         "address":"",
         "remarks":"",
         "workaddress":1,
-        "value":[]
+        "value":[],
+        isdefault:0
       }
     }
   },

src/SManagement/setenterpriseInfo/index.vue

@@ -8,25 +8,25 @@
             <template slot="label">
               企业名称
             </template>
-            {{enterpriseInfo.enterprisename}}
+            {{enterpriseInfo.enterprisename ? enterpriseInfo.enterprisename : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               企业简称
             </template>
-            {{enterpriseInfo.abbreviation}}
+            {{enterpriseInfo.abbreviation ? enterpriseInfo.abbreviation : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               联系人
             </template>
-            {{enterpriseInfo.contact}}
+            {{enterpriseInfo.contact ? enterpriseInfo.contact : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               联系电话
             </template>
-            {{enterpriseInfo.phonenumber}}
+            {{enterpriseInfo.phonenumber ? enterpriseInfo.phonenumber : '--'}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">

src/components/newLayout/index.vue

@@ -29,6 +29,8 @@ export default {
     menuTemp,
     navTemp
   },
+  computed: {
+  },
   data () {
     return {
 

src/components/newLayout/modules/header.vue

@@ -65,17 +65,14 @@ export default {
   methods:{
     // 选择登录账号
     selectAccount (item) {
-
       let arr = ['module_info','activeApp','active_modules','folderid']
       arr.forEach(key=>{
         sessionStorage.removeItem(key)
       })
-
       sessionStorage.setItem('active_account',JSON.stringify(item))
-
       this.basicData.query_userauth().then(()=>{
         this.basicData.querySite_Parameter()
-        this.$router.replace({path:'/home'})
+        this.$router.go(0)
         /*this.accountInfo = item*/
         this.siteInfos()
         this.accountInfo = JSON.parse(sessionStorage.getItem('active_account'))

src/store/index.js

@@ -26,7 +26,7 @@ export default new Vuex.Store({
     searchValue:'',
     closeDrawerTemp:false,
     DrawerShow:false,
-    historyRouter:null
+    historyRouter:null,
   },
   getters: {
     siteinfo:state => state.siteinfo,
@@ -45,7 +45,7 @@ export default new Vuex.Store({
     closeDrawerTemp:state => state.closeDrawerTemp,
     DrawerShow:state => state.DrawerShow,
     sys_modules:state => state.sys_modules,
-    historyRouter:state => state.historyRouter
+    historyRouter:state => state.historyRouter,
     
   },
   mutations: {

src/template/invoiceCanUseAgent/index.vue

@@ -5,6 +5,7 @@
     </div>
     <div>
       <el-table
+        height="60vh"
         ref="multipleTable"
         :data="tableData"
         style="width: 100%"

src/template/product/index.vue

@@ -146,6 +146,8 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/utils/basic-data.js

@@ -1,5 +1,6 @@
 import api from '../api/api'
 import tool from './tool'
+import store from '../store/index'
 
 var areaData = [];
 /* 企业列表数据 */
@@ -43,6 +44,7 @@ function getEnterpriseList () {
       let active_modules = res.data[0].modules[0]
       sessionStorage.setItem('module_info', JSON.stringify(res.data))
       sessionStorage.setItem('active_modules', JSON.stringify(active_modules))
+      store.dispatch('setActiveApp',{name:active_modules.apps[0].systemappname,app:active_modules.apps[0],val:''})
       reslove()
   
     })