codeMan il y a 2 ans
Parent
commit
2c736292ec

+ 1 - 1
src/Form/recvoucher/add.vue

@@ -31,7 +31,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="收入金额:" prop="amount">
-                <el-input v-model="form.amount" placeholder="请输入支出金额"></el-input>
+                <el-input v-model="form.amount" placeholder="请输入收入金额"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

+ 2 - 1
src/HDrpManagement/ProductMag/modules/addClass.vue

@@ -42,6 +42,7 @@
 
 <script>
 import selectTable from '@/components/selectTable/index'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   props:['data'],
   components:{selectTable},
@@ -93,7 +94,7 @@ export default {
             "sa_brandid":0,
             "itemid": this.$route.query.id,
             "where": {
-              istool: this.data.istool ? 1 : 0
+              istool: this.data.data.istool ? 1 : 0
             }
           }
       })

+ 1 - 0
src/HDrpManagement/dispatch/modules/add.vue

@@ -23,6 +23,7 @@
       </el-date-picker>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号"></el-table-column>
+        <el-table-column prop="type" label="订单类型"></el-table-column>
         <el-table-column prop="projectname" label="项目名称"></el-table-column>
         <el-table-column prop="projectnote" label="项目备注"></el-table-column>
         <el-table-column prop="enterprisename" label="企业名称"></el-table-column>

+ 1 - 1
src/HDrpManagement/orderManage/index.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="mt-10">
           <p class="search__label">订单类型:</p>
-          <el-select v-model="where.type" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
+          <el-select v-model="where.type" clearable style="margin-right:10px" size="small" placeholder="请选择订单类型" @change="change">
             <el-option label="标准订单" value="标准订单"></el-option>
             <el-option label="特殊订单" value="特殊订单"></el-option>
             <el-option label="项目订单" value="项目订单"></el-option>

+ 1 - 1
src/HDrpManagement/orderManage/modules/add.vue

@@ -98,7 +98,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
+            <el-col :span="12" v-if="siteId=='HY' && (form.type =='标准订单' || form.type =='项目订单')">
               <el-form-item label="是否样品订单" prop="typemx">
                 <el-radio-group v-model="form.typemx">
                   <el-radio label="样品">是</el-radio>

+ 1 - 1
src/HManagement/accountManage/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" :type="data.status !== 'ACTIVE'?'primary':''" :disabled="data.status === 'ACTIVE'" @click="onShow">编 辑</el-button>
+    <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
     <el-drawer
       title="编辑用户"
       :visible.sync="drawer"

+ 150 - 0
src/SDrpManagement/Products/modules/Select copy 2.vue

@@ -0,0 +1,150 @@
+<template>
+  <div class="border-bottom">
+    <div>
+      <ul class="flex-align-center normal-margin-new" >
+        <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField(null)" >全部领域</li>
+        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+      </ul>
+      <ul class="flex-align-center normal-margin-new">
+        <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand(null)">全部品牌</li>
+        <li  :class="brand_act == item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
+      </ul>
+      <ul class="flex-align-center normal-margin-new">
+        <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
+        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+      </ul>
+      <classTree v-if="brand_act !== ''" style="padding-left:80px" :data="activeClass.subdep" @onClassChange="change"></classTree>
+    </div>
+  </div>
+</template>
+
+<script>
+import classTree from './classTree.vue'
+export default {
+  data () {
+    return {
+      value:'',
+      brands:[],
+      fields:[],
+      itemclass:[],
+      activeClass:{},
+      field_act:'',
+      brand_act:'',
+      class_act:''
+    }
+  },
+  props: {
+    default: {
+      type: Boolean,
+      default:() => false
+    }
+  },
+  components:{
+    classTree
+  },
+  methods:{
+    async queryAgentiInfo () {
+      const res1 = await this.$api.requested({
+        "id": 20221223141802,
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+        }
+      })
+      this.fields = res1.data
+      this.field_act = ''
+    },
+    async queryBrands () {
+      const res = await this.$api.requested({
+        "id": "20220924163702",
+        "content": {
+          "pageSize":1000,
+          "where":{
+            "condition":""
+          }
+        }
+      })
+      this.brands = res.data
+      this.brand_act = ''
+      // this.clickBrand(res.data[0].sa_brandid)
+    },
+
+    async queryClass () {
+      const res = await this.$api.requested({
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:1}}
+      })
+      this.itemclass = res.data[0].ttemclass
+    },
+    clickBrand (id) {
+      this.brand_act = id ? id : ''
+      this.queryClass()
+      
+    },
+    clickField (item) {
+      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
+      console.log( item,this.field_act)
+      this.$emit('clickField',item)
+    },
+    clickClass (item) {
+      if (item) {
+        this.activeClass = item
+        console.log(item);
+        
+        this.class_act = item.itemclassnum
+        this.change(item)
+      } else {
+        this.class_act = ''
+        this.$emit('onClassChange',item)
+      }
+      console.log(this.class_act);
+      
+      
+    },
+    change(n) {
+      console.log(n)
+      this.$emit('onClassChange',n)
+    },
+    clearSearch() {
+      this.$emit('clearSearch')
+    }
+  },
+  mounted () {
+    this.queryClass()
+    this.queryAgentiInfo()
+    this.queryBrands()
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.brand-item{
+  margin:5px 40px;
+  color: #333;
+  cursor: pointer;
+  transition: .2s all linear;
+  font-size: 14px;
+}
+.act{
+  color:#3874f6;
+  font-weight: bold;
+}
+.normal-margin-new{
+  margin-bottom: 2px !important;
+}
+.border-bottom{
+  padding-bottom:16px;
+  border-bottom: 1px solid #e3e5ea;
+}
+.border-all{
+  margin-left: 0px
+}
+.margin-notAll{
+  margin-left: -18px
+}
+
+</style>

+ 2 - 2
src/SDrpManagement/agentOrder/modules/add.vue

@@ -75,14 +75,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
+            <!-- <el-col :span="12" v-if="siteId=='HY' && (form.type =='标准订单' || form.type =='项目订单')">
               <el-form-item label="是否样品订单" prop="typemx">
                 <el-radio-group v-model="form.typemx">
                   <el-radio label="样品">是</el-radio>
                   <el-radio label="">否</el-radio>
                 </el-radio-group>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="24"  v-if="form.type ==='标准订单' || form.type ==='特殊订单' || form.type ==='样品订单'">
               <el-form-item label="项目备注">
                 <el-input size="mini" class="order__note__input" type="textarea" v-model="form.projectnote" :autosize="{minRows:5}" placeholder="请输入项目备注"></el-input>

+ 1 - 1
src/SDrpManagement/salerOrder/modules/add.vue

@@ -98,7 +98,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
+            <el-col :span="12" v-if="siteId=='HY' && (form.type =='标准订单' || form.type =='项目订单')">
               <el-form-item label="是否样品订单" prop="typemx">
                 <el-radio-group v-model="form.typemx">
                   <el-radio label="样品">是</el-radio>

+ 1 - 1
vue.config.js

@@ -27,4 +27,4 @@ module.exports = {
         },
       }
     }
-}
+}