Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HDrpManagement/BrandManage/component/saleclass/index.vue

@@ -1,53 +1,51 @@
 <template>
-  <div class="brand normal-panel">
-    <dep-list @onClick="onClick" ref="list">
-      <template v-slot:add="scope">
-        <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 && 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 && tool.checkAuth($route.name,'delete')"/>
-      </template>
-    </dep-list>
+  <div class="brand">
+    <el-table
+      :data="tableData"
+      row-key="id"
+      border
+      :tree-props="{children: 'subdep', hasChildren: 'hasChildren'}">
+      <el-table-column
+        prop="itemclassname"
+        label="分类名称">
+      </el-table-column>
+      <el-table-column
+        prop="itemclassnum"
+        label="分类编号">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="地址">
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 
 <script>
-import DepList from './components/dep_list'
-import Edit from './components/edit'
-import Del from './components/delete'
 export default {
-  name: '',
-  
+  props:['data'],
   data() {
     return {
-      tablecols1:'',
-      list:''
-    };
-  },
-  components: {DepList,Edit,Del},
-  computed:{
-  },
-  watch:{
+      tableData:[]
+    }
   },
   created() {
-    this.tablecols1 = this.tool.tabelCol(this.$route.name).salesTable.tablecols
   },
   methods: {
-    onClick(node) {
-      console.log(node);
-      this.list = [node.data]
-      // this.list = node
-    },
-    addSuccess() {
-      this.$refs.list.department()
-    },
-    deleteSuccess() {
-      this.$refs.list.department()
+    async department (callback) {
+      const res = await this.$api.requested({
+        "id": "20220922110403",
+        "version":1,
+        "content": {
+          "sa_brandid":this.data.sa_brandid
+        }
+      })
+      this.tableData = res.data[0].ttemclass
     }
   },
+  mounted () {
+    this.department()
+  }
 };
 </script>
 

src/HDrpManagement/BrandManage/modules/edit.vue

@@ -8,23 +8,17 @@
       direction="rtl"
       append-to-body>
       <div class="drawer__panel">
-        <el-row :gutter="50">
-          <el-form  :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="80px">
-            <el-col :span="20">
-              <el-form-item  prop="brandname" label="品牌名称">
-                <el-input v-model="form.brandname"  placeholder="输入品牌名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item  label="品牌logo">
-                <uploadFile ref="upload" v-if="data.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand',ownerid:form.sa_brandid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
-                <previewImage v-else  :image="data.attinfos[0]" :deletebtn="true"
-                  @onSuccess="clearCover"></previewImage>
-                <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
-              </el-form-item>
-            </el-col>
-          </el-form>
-        </el-row>
+        <el-form  :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="80px">
+          <el-form-item  prop="brandname" label="品牌名称">
+            <el-input v-model="form.brandname"  placeholder="输入品牌名称"></el-input>
+          </el-form-item>
+          <el-form-item  label="品牌logo">
+            <uploadFile ref="upload" v-if="data.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand',ownerid:form.sa_brandid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
+            <previewImage v-else  :image="data.attinfos[0]" :deletebtn="true"
+              @onSuccess="clearCover"></previewImage>
+            <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
+          </el-form-item>
+        </el-form>
         <saleclass :data="data"></saleclass>
       </div>
       <div class="fixed__btn__panel">

src/SManagement/sales_forecast/modules/product.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-input class="mt-10" style="width:200px" suffix-icon="el-icon-search" size="small" placeholder="搜索" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+    <el-input class="mt-10" style="width:200px" suffix-icon="el-icon-search" size="small" placeholder="搜索" v-model="param.content.where.condition" @keyup.native.enter="search()" @clear="search()" clearable></el-input>
     <el-table
       ref="multipleTable"
       :data="list"
@@ -147,6 +147,10 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
     },
+    async search () {
+      this.param.content.pageNumber = 1
+      this.listData(this.param.content.where.sa_projectid)
+    },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val

src/components/normal-basic-layout/index.vue

@@ -17,7 +17,7 @@
                 <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
               </div>
               <el-button-group v-if="tool.checkAuth($route.name,'delete')" class="inline-16">
-                <el-button type="default" :disabled="selection.length === 0" size="small" @click="deleteData">删 除</el-button>
+                <el-button :type="selection.length === 0?'':'primary'" :disabled="selection.length === 0" size="small" @click="deleteData">删 除</el-button>
               </el-button-group>
               <!-- <el-button class="inline-16" size="small" type="primary" plain>导 入</el-button> -->
               <excel :tablecols="layout" :param="param" :total="total" :excelTitle="routerName"></excel>