productGroup

src/HDrpManagement/ProductGroupMag/index.vue

@@ -1,12 +1,26 @@
 <template>
   <div>
-    <div class="container normal-panel normal-margin">
-      <add></add>
+    <div class="container normal-panel normal-margin" style="display:flex">
+      <add type="add" @addSuccess="$refs.list.listData()" :productData="productList" :brandData="brandList" v-if="tool.checkAuth($route.name,'update')"></add>
+      <Up type="all" style="margin-left:16px" @upSuccess="onSuccess()" :id="checkboxData.map(item => item.sa_itemgroupid)" v-if="Object.keys(checkboxData).length > 0 && checkboxData[0].isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
+      <Down type="all" style="margin-left:16px" @downSuccess="onSuccess()" :id="checkboxData.map(item => item.sa_itemgroupid)" v-if="Object.keys(checkboxData).length > 0 && checkboxData[0].isonsale == 1 && tool.checkAuth($route.name,'down_sales')"></Down>
     </div>
     <div class="container normal-panel normal-margin">
-      <list ref="list">
+      <list ref="list" @checkboxCallBack="checkboxCallBack">
         <template v-slot:detail="scope">
-          <product_detail :data="scope.data" @onSuccess="onSuccess"  :type="'text'"></product_detail>
+          <product_detail :data="scope.data"  :type="'text'"></product_detail>
+        </template>
+        <template v-slot:edit="scope">
+          <add v-if="tool.checkAuth($route.name,'update')" type="edit" @addSuccess="onSuccess()" :productData="productList" :brandData="brandList" :groupData="scope.data"></add>
+        </template>
+        <template v-slot:del="scope">
+          <Del v-if="tool.checkAuth($route.name,'delete') && scope.data.isonsale == 0" type="group" @deleteSuccess="onSuccess()" :id="scope.data.sa_itemgroupid"></Del>
+        </template>
+        <template v-slot:up="scope">
+          <Up type="one" @upSuccess="onSuccess()" :id="[scope.data.sa_itemgroupid]" v-if="scope.data.isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
+        </template>
+        <template v-slot:down="scope">
+          <Down type="one" @downSuccess="onSuccess()" :id="[scope.data.sa_itemgroupid]" v-if="scope.data.isonsale == 1 && tool.checkAuth($route.name,'down_sales')"></Down>
         </template>
       </list>
     </div>
@@ -14,18 +28,79 @@
 </template>
 
 <script>
-import list from './modules/list';
-import add from './modules/add';
+
+
 import product_detail from './modules/details.vue';
+
+import list from './modules/list'
+
+import add from './modules/add'
+import Del from './modules/delete'
+import Up from './modules/up'
+import Down from './modules/down'
+
+
 export default {
   name:"index",
   components:{
     list,
     add,
-    product_detail
+    product_detail,
+    Del,
+    Up,
+    Down,
+  },
+  data() {
+    return {
+      /* 商品列表数据 */
+      productList:'',
+      /* 品牌列表数据 */
+      brandList:'',
+      checkboxData:{}
+    }
   },
-  methods:{
+  created() {
+    this.getProductList()
+    this.getBrandList()
+  },
+  methods: {
+    /* 可选择的商品列表 */
+    async getProductList() {
+      let res = await this.$api.requested({
+          "id": "20220923112503",
+          "version":1,
+          "content": {
+            "nocache":true,
+            "sa_itemgroupid":0,
+            "where":{
+                "condition":""
+            }
+          }
+      })
+      this.productList = res.data
+      console.log(this.productList,'商品');
+      
+    },
+    /* 可选择的品牌列表 */
+    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,'品牌');
+    },
+    checkboxCallBack(data) {
+      this.checkboxData = data
+    },
     onSuccess () {
+      console.log("执行更新")
       this.$refs.list.listData()
     },
   }

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -1,12 +1,195 @@
 <template>
-  <div>add</div>
+  <div class="inline-16">
+    <el-button type="primary" size="small" @click="dialogTableVisible=true" v-if="type == 'add'">新增产品组</el-button>
+    <el-button type="text" size="small" @click="editBtn" v-else>编辑</el-button>
+    <el-dialog title="新增产品" :visible.sync="dialogTableVisible" width="30%">
+      <el-row :gutter="20">
+        <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
+          <el-col :span="24">
+            <el-form-item label="产品组名称" prop="groupname">
+              <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="品牌" prop="sa_brandid">
+              <el-select v-model="form.sa_brandid" placeholder="请选择品牌">
+                <el-option
+                  v-for="item in brandData"
+                  :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">
+            <el-form-item label="商品" prop="itemno">
+              <el-select v-model="form.itemno" placeholder="请选择商品">
+                <el-option
+                  v-for="item in productData"
+                  :key="item.itemno"
+                  :label="item.itemname"
+                  :value="item.itemno"
+                  size="small">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="自定义标签" prop="tag" style="margin-bottom:0px; !important">
+              <el-tag
+                :key="tag"
+                v-for="tag in form.tag"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(tag)">
+                {{tag}}
+              </el-tag>
+              <el-input
+                class="input-new-tag"
+                v-if="inputVisible"
+                v-model="inputValue"
+                ref="saveTagInput"
+                size="small"
+                @keyup.enter.native="handleInputConfirm"
+                @blur="handleInputConfirm"
+              >
+              </el-input>
+              <el-button v-else class="button-new-tag" size="small" @click="showInput">+ New 标签</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <div>
+          <el-button @click="dialogTableVisible = false" size="small">取 消</el-button>
+          <el-button type="primary" @click="submit" size="small">确 定</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 export default {
-
+  data () {
+    return {
+      dialogTableVisible:false,
+      /* 当前选择的组 */
+      seleteGroup:'',
+      inputVisible: false,
+      inputValue: '',
+      form:{
+        sa_brandid:'',
+        groupname:'',
+        itemno:'',
+        tag:[]
+      },
+      rules:{
+        sa_brandid: [
+          { required: true, message: '请选择品牌', trigger: 'blur' },
+        ],
+        groupname: [
+          { required: true, message: '请输入商品组名称', trigger: 'blur' },
+        ],
+        itemno: [
+          { required: true, message: '请选择商品', trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  props:['type','brandData','productData','groupData'],
+  watch: {
+    
+  },
+  created() {
+    
+  },
+  methods: {
+    submit() {
+      this.$refs.form.validate(async val => {
+        if(val) {
+          let res = await this.$api.requested({
+            "id": "20220922164303",
+            "version":1,
+            "content": {
+                "sa_itemgroupid":this.type == 'add' ? 0 : this.groupData.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('addSuccess')
+            this.dialogTableVisible = false
+          })
+        }
+      })
+    },
+    editBtn() {      
+      this.dialogTableVisible = true
+      this.seleteGroup = this.groupData
+      let temp = JSON.parse(JSON.stringify(this.seleteGroup))
+      this.form = {
+        sa_brandid:temp.sa_brandid,
+        groupname:temp.groupname,
+        itemno:temp.itemno,
+        tag:temp.tag1
+      }
+    },
+    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 = '';
+    }
+  }
 }
 
 </script>
-<style>
+<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;
+}
+/deep/.el-form-item {
+  width: 100% !important;
+}
+.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;
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+}
 </style>

src/HDrpManagement/ProductGroupMag/modules/delete.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="inline-16">
+    <el-popconfirm title="确定删除当前数据吗？" @confirm="deleteRow()">
+      <el-button slot="reference" size="small" type="text">删 除</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['type', 'id','detailId'],
+  methods: {
+    async deleteRow () {
+      let res
+      if (this.type == 'group') {
+        res = await this.$api.requested({
+          "id": "20220922164503",
+          "version": 1,
+          "content": {
+            "sa_itemgroupid": this.id
+          }
+        })
+      } else {
+        res = await this.$api.requested({
+          "id": "20220923105103",
+          "version": 1,
+          "content": {
+            "sa_itemgroupid": this.id,
+            "sa_itemgroupmxid": this.detailId
+          }
+        })
+      }
+      console.log(res);
+      this.tool.showMessage(res, () => {
+        this.$emit('deleteSuccess')
+      })
+    },
+  }
+}
+
+</script>

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -1,5 +1,5 @@
 <template>
-    <div >
+    <div class="inline-16">
         <el-button size="small" type="text" @click="onShow">详情</el-button>
         <el-dialog
         title="商品组详情"
@@ -11,54 +11,53 @@
         <el-row :gutter="50">
           <el-form  ref="form"  size="mini" label-position="left" label-width="80px" disabled> 
             <el-col :span="15">
-              <el-form-item   label="商品组名">
-                <el-tag v-if="form.groupname">{{form.groupname}}</el-tag>
+              <el-form-item   label="商品组名:">
+                <p v-if="form.groupname">{{form.groupname}}</p>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item   label="商品组号">
-                <el-tag v-if="form.groupnum">{{form.groupnum}}</el-tag>
+              <el-form-item   label="商品组号:">
+                <p v-if="form.groupnum">{{form.groupnum}}</p>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item   label="品牌名称">
-                <el-tag v-if="form.brandname">{{form.brandname}}</el-tag>
+              <el-form-item   label="品牌名称:">
+                <p v-if="form.brandname">{{form.brandname}}</p>
               </el-form-item>
             </el-col>
             <el-col :span="15">
-              <el-form-item   label="是否上架">
-                <el-switch 
-                  v-model="isonsale" disabled>
-                </el-switch>
+              <el-form-item   label="是否上架:">
+                <p v-if="form.isonsale">上架</p>
+                <p v-else>下架</p>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item   label="产品名">
-                <el-tag v-if="form.itemname">{{form.itemname}}</el-tag>
+              <el-form-item   label="产品名:">
+                <p v-if="form.itemname">{{form.itemname}}</p>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item   label="产品类别">
-                <el-tag v-if="form.itemclassname">{{form.itemclassname}}</el-tag>
+              <el-form-item   label="产品类别:">
+                <p v-if="form.itemclassname">{{form.itemclassname}}</p>
               </el-form-item>
             </el-col>
             <el-col :span="20">
-              <el-form-item   label="标签">
+              <el-form-item   label="标签:">
                 <div v-if="tag">
                   <div v-for="(item,index) in form.tag1" :key="index" style="float:left;margin-left: 2%;margin-top: 2%;" >
-                    <el-tag  >{{form.tag1[index]}}</el-tag>
+                    <el-tag  size="small">{{form.tag1[index]}}</el-tag>
                   </div>
                 </div>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item   label="创建人员">
-                <el-tag v-if="form.createby">{{form.createby}}</el-tag>
+              <el-form-item   label="创建人员:">
+                <p v-if="form.createby">{{form.createby}}</p>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item   label="更新人员">
-                <el-tag v-if="form.changeby">{{form.changeby}}</el-tag>
+              <el-form-item   label="更新人员:">
+                <p v-if="form.changeby">{{form.changeby}}</p>
               </el-form-item>
             </el-col>
           </el-form>

src/HDrpManagement/ProductGroupMag/modules/down.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="inline-16">
+    <el-popconfirm title="确定下架当前数据吗？" @confirm="deleteRow()">
+      <el-button slot="reference" size="small" type="text" v-if="type=='one'">下 架</el-button>
+      <el-button slot="reference" size="small" type="warning" v-else>批量下架</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data() {
+    return {
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  props:['id','type'],
+  methods: {
+    async deleteRow() {
+      let res = await this.$api.requested({
+        "id": "20220923143703",
+        "version":1,
+        "content": {
+          "sa_itemgroupids": this.id
+        }
+      })
+      console.log(res);
+      this.tool.showMessage(res,() => {
+        this.$emit('downSuccess')
+      })
+    }
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/ProductGroupMag/modules/list.vue

@@ -1,22 +1,29 @@
 <template>
   <div>
     <select_proGro  @searchActive="searchActive" ></select_proGro>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght">
+    <table1 :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght" :checkbox="true" v-on="$listeners">
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'isonsale'">
-          <el-switch v-if="scope.column.data[scope.column.columnname] === 0"
-            v-model="isonsales" disabled>
-          </el-switch>
-          <el-switch v-if="scope.column.data[scope.column.columnname] === 1"
-            v-model="isonsale" disabled>
-          </el-switch>
+          <span v-if="scope.column.data[scope.column.columnname] === 0"
+            >下架
+          </span>
+          <span v-if="scope.column.data[scope.column.columnname] === 1"
+            >上架
+          </span>
         </div>
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
-        <slot name="detail" :data="scope.data"></slot>
+        <div>
+          <slot name="detail" :data="scope.data"></slot>
+          <slot name="edit" :data="scope.data"></slot>
+          <slot name="up" :data="scope.data"></slot>
+          <slot name="down" :data="scope.data"></slot>
+          <slot name="del" :data="scope.data"></slot>
+        </div>
       </template>
-    </tableLayout>
+      </table1>
+    <!-- </tableLayout> -->
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
@@ -33,7 +40,8 @@
 </template>
 
 <script>
-import select_proGro from './search.vue'
+import select_proGro from './search'
+import table1 from './table'
 export default {
   name: "list",
   data() {
@@ -51,6 +59,7 @@ export default {
         "content": {
           pageNumber:1,
           pageSize:10,
+          "nocache":true,
           "where":{
             "condition":""
           }
@@ -59,13 +68,14 @@ export default {
     }
   },
   components:{
-    select_proGro
+    select_proGro,
+    table1
   },
   mounted() {
-    this.queryData();
+    this.listData();
   },
   methods:{
-    async queryData(){
+    async listData(){
       const res=await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
@@ -73,17 +83,17 @@ export default {
     },
     searchActive(data) {
       this.params.content.where.condition = data
-      this.queryData()
+      this.listData()
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
-      this.queryData()
+      this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
-      this.queryData()
+      this.listData()
     },
   },
   created() {
@@ -93,4 +103,5 @@ export default {
 
 </script>
 <style>
+
 </style>

src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <el-table ref="tables" :header-cell-class-name="cellClass" :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%" @selection-change="handleSelectionChange"  border>
+      <el-table-column
+        type="selection"
+        width="55" @handleSelectionChange="handleSelectionChange" @select-all="selectAll" v-if="checkbox" :selectable="isCheck">
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width">
+        <template slot-scope="scope">
+          <!-- 自定义表格显示内容 -->
+          <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+          <!-- 否则就是默认 -->
+          <span v-else>{{scope.row[col.columnname]}}</span>
+          <!-- 操作结构内容 -->
+          <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','checkbox'],
+  data () {
+    return {
+      list:[],
+      upOrDown:''
+    }
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
+  methods:{
+    rowClick (row) {
+      this.$emit('rowClick',row)
+    },
+    tableClassName ({row,rowIndex}) {
+      row.index = rowIndex
+    },
+    handleSelectionChange(val) {
+      this.upOrDown = val[0] ? val[0].isonsale : ''
+      console.log(this.upOrDown);
+      this.$emit('checkboxCallBack',val)      
+    },
+    selectAll(val) {
+
+    },
+    cellClass(row){
+      console.log(row)
+      if (row.columnIndex === 0) {
+        if(this.upOrDown === '') {
+          return 'DisableSelection'
+        }
+      }
+    },
+    isCheck(row,rowIndex) {
+      if(this.upOrDown === '') return true
+      if( row.isonsale != this.upOrDown ) {
+        return false
+      } else {
+        return true
+      }
+    }
+  },
+  mounted () {
+    // this.listData()
+  }
+}
+
+</script>
+<style scoped>
+
+/deep/.el-table__header .DisableSelection > .cell {
+  display: none !important;
+}
+</style>

src/HDrpManagement/ProductGroupMag/modules/up.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="inline-16">
+    <el-popconfirm title="确定上架当前数据吗？" @confirm="deleteRow()">
+      <el-button slot="reference" size="small" type="text" v-if="type=='one'">上 架</el-button>
+    <el-button slot="reference" size="small" type="warning" v-else>批量上架</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data() {
+    return {
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  props:['id','type'],
+  methods: {
+    async deleteRow() {
+      let res = await this.$api.requested({
+        "id": "20220923143603",
+        "version":1,
+        "content": {
+          "sa_itemgroupids": this.id
+        }
+      })
+      console.log(res);
+      this.tool.showMessage(res,() => {
+        this.$emit('upSuccess')
+      })
+    }
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/saleclass/index.vue

@@ -2,13 +2,13 @@
   <div class="brand normal-panel">
     <dep-list @onClick="onClick" ref="list">
       <template v-slot:add="scope">
-        <Edit type="add" @addSuccess="addSuccess" :rowData="scope.data"/>
+        <Edit type="add" @addSuccess="addSuccess" :rowData="scope.data" v-if="tool.checkAuth($route.name,'insert')"/>
       </template>
       <template v-slot:edit="scope">
-        <Edit type="edit" @addSuccess="addSuccess" v-if="scope.data.itemclassid" :rowData="scope.data"/>
+        <Edit type="edit" @addSuccess="addSuccess" v-if="scope.data.itemclassid && tool.checkAuth($route.name,'update')" :rowData="scope.data"/>
       </template>
       <template v-slot:del="scope">
-        <Del :id="scope.data.itemclassid" @deleteSuccess="deleteSuccess" v-if="scope.data.itemclassid"/>
+        <Del :id="scope.data.itemclassid" @deleteSuccess="deleteSuccess" v-if="scope.data.itemclassid && tool.checkAuth($route.name,'delete')"/>
       </template>
     </dep-list>
   </div>

src/SManagement/orderclue/components/list.vue

@@ -21,7 +21,7 @@
         </div>
       </div>
       <table1 :layout="tablecols" :custom="true" :checkbox="true" :data="list" :height="tableHieght"
-        @checkboxCallBack="checkboxCallBack" v-if="tool.checkAuth($route.name,'read')">
+        @checkboxCallBack="checkboxCallBack">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'rowindex'" style="display:flex;align-items: center;">
             <p>{{ scope.column.data[scope.column.columnname] }}</p>

src/SManagement/sales_forecast/index.vue

@@ -8,7 +8,7 @@
           :list="[{label:'按产品类别预测',value:'0'},{label:'按项目及产品类别预测',value:'1'}]" style="margin-right:16px" />
       </div>
       <tableLayout v-if="salesPanelList" :layout="tablecols" :data="salesPanelList" :custom="true" height="30vh"
-        @rowClick="rowClick">
+        @rowClick="rowClick" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'periodtype'">
             <span>
@@ -22,6 +22,9 @@
           <div v-else-if="scope.column.columnname == 'date'">
             <span>{{scope.column.data.begdate}}至{{scope.column.data.enddate}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'status'">
+            <span :style="scope.column.data[scope.column.columnname] == '发布' ? 'color: rgb(82, 196, 26)' : ''">{{scope.column.data[scope.column.columnname]}}</span>
+          </div>
           <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
         </template>
         <template v-slot:opreation="scope">

src/SManagement/sales_forecast/modules/editProduct.vue

@@ -134,9 +134,8 @@ export default {
           }
         }
       })
-      console.log(res.data[0]);
-      
-      !res.data[0].itemclassnum == true ? this.projectList = [] : this.projectList = res.data
+      console.log(res.data);
+      !res.data[0].itemclassnum ? this.projectList = [] : this.projectList = res.data
 
     },
     /* 获取所有产品数据 */

src/SManagement/sales_forecast/modules/editSales.vue

@@ -151,9 +151,7 @@ export default {
               }
           }
       })
-      typeof res.data[0].sa_projectid === 'undefined' || res.data[0].sa_projectid === 0 ? this.list = [] : this.list = res.data 
-      console.log(res);
-      
+      this.list = res.data.filter(item => item.projectnum)
     },
     /* 获取所有产品数据 */
     async getProductList() {