Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/dispatch/details/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="`${mainData.billno}`"
-        :oldFormPath="{edit:'HDrpManagement/dispatch/modules'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         delApiId="20221114135503"
@@ -17,6 +16,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.STATUS == '新建'" :data="mainData" @onSuccess="onSuccess" />
         <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">生成物流单</el-button>
         <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?'反审':mainData.STATUS === '复核'?'反审':'审核'}}</el-button>
         <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?'反复核':'复核'}}</el-button>
@@ -25,15 +25,17 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot1" >
-        <product-list :mainData="mainData"></product-list>
+        <product-list ref="product" :mainData="mainData"></product-list>
       </div>
     </basicDetails>
   </div>
 </template>
 
 <script>
+import Edit from '../modules/edit'
 import productList from '../modules/productlist.vue'
 import defaultInfo from '../modules/defaultInfo.vue'
+import { log } from '@antv/g2plot/lib/utils'
   export default {
     name: "detail",
     data() {
@@ -43,6 +45,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
       }
     },
     components:{
+      Edit,
       productList,
       defaultInfo
     },
@@ -129,6 +132,9 @@ import defaultInfo from '../modules/defaultInfo.vue'
       onSuccess(){
         this.visible = false
         this.queryMainData(this.$route.query.id)
+        this.$refs.product && this.$refs.product.listData()
+        console.log('触发');
+        
         this.$emit('onSuccess')
       },
       onCheck () {

src/HDrpManagement/dispatch/modules/edit.vue

@@ -192,6 +192,7 @@ export default {
     },
     onDelSuccess () {
       this.$refs.addpro.listData()
+      this.$emit('onSuccess')
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12
@@ -212,6 +213,7 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$refs.prolist.listData()
         this.$refs.addpro.listData()
+        this.$emit('onSuccess')
       })
     }
   },

src/HDrpManagement/writeoffbill/components/add.vue

@@ -44,6 +44,14 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="订单">
+                <div class="flex-align-center flex-between mt-10">
+                  <el-input 
+                    style="width:200px" 
+                    size="small"  
+                    suffix-icon="el-icon-search" 
+                    v-model="params.content.where.condition" placeholder="搜索" 
+                    @keyup.enter.native="getOrderList(params.content.pageNumber = 1)" @clear="getOrderList(params.content.pageNumber = 1)" clearable></el-input>
+                </div>
                 <selectOrder v-if="dialogFormVisible" ref="table" idName="sa_orderitemsid" :layout="tablecols" :data="orderList" :custom="true" height="500px">
                   <template v-slot:customcol="scope">
                       <div>{{scope.column.data[scope.column.columnname]}}</div>
@@ -57,7 +65,7 @@
                       @size-change="handleSizeChange"
                       @current-change="handleCurrentChange"
                       :current-page="params.content.pageNumber"
-                      :page-sizes="[20, 50, 100, 200]"
+                      :page-size="params.content.pageSize"
                       layout="total,sizes, prev, pager, next, jumper"
                       :total="total">
                   </el-pagination>

src/HDrpManagement/writeoffbill/components/selectVoucher.vue

@@ -21,25 +21,17 @@
             width="180">
           </el-table-column>
           <el-table-column
-            prop="accountname"
-            label="账户类型"
+            prop="checkdate"
+            label="审核时间"
             width="180">
           </el-table-column>
-          <!-- <el-table-column
-            prop="billno"
-            label="经销商">
-          </el-table-column> -->
           <el-table-column
             prop="amount"
-            label="支出金额">
-          </el-table-column>
-          <el-table-column
-            prop="source"
-            label="凭证来源">
+            label="金额">
           </el-table-column>
           <el-table-column
-            prop="status"
-            label="状态">
+            prop="class"
+            label="分类">
           </el-table-column>
           <el-table-column>
             <template slot-scope="scope">

src/HManagement/archives_ad/modules/filterList.vue

@@ -3,14 +3,14 @@
         <div>
             <p>一级分类:</p>
             <el-select clear="select" v-model="activeClass1" @clear="clearClass1" size="small" clearable>
-                <el-option v-for="item in selectList" :key="item.rowindex" :value="item.sat_courseware_classid"
+                <el-option v-for="item in selectList" :key="item.rowindex" :value="item[id]"
                     :label="item.classname" @click.native="handleChange(item)" />
             </el-select>
         </div>
         <div>
             <p>二级分类:</p>
             <el-select clear="select" v-model="activeClass2" size="small" @clear="clearClass2" clearable>
-                <el-option v-for="item in childrens" :key="item.rowindex" :value="item.sat_courseware_classid"
+                <el-option v-for="item in childrens" :key="item.rowindex" :value="item[id]"
                     :label="item.classname" @click.native="handleChange(item)" />
             </el-select>
         </div>
@@ -29,7 +29,7 @@ export default {
     mounted() {
         this.getSelectList()
     },
-    props: ["changeTypeId", "startSearch"],
+    props: ["changeTypeId", "startSearch",'customParam','id'],
     data() {
         return {
             selectList: [],//分类列表
@@ -45,7 +45,7 @@ export default {
     methods: {
         /* 获取分类列表 */
         getSelectList(i = 0) {
-            this.$api.requested({
+            this.$api.requested(this.customParam ? this.customParam : {
                 "id": 20221102143302,
                 "content": {
                     parentid: 0
@@ -60,11 +60,11 @@ export default {
             if (item.children) {
                 this.childrens = item.children;
                 this.activeClass2 = "";
-                this.class1id = item.sat_courseware_classid;
+                this.class1id = item[this.id];
             } else {
-                this.class2id = item.sat_courseware_classid;
+                this.class2id = item[this.id];
             }
-            this.returnId = item.sat_courseware_classid;
+            this.returnId = item[this.id];
             this.setId();
         },
         clearClass1() {

src/SManagement/archives_ad/components/Edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button type="text" size="mini" @click.stop="edit()" :disabled="fileData.isAuth == 0">编辑</el-button>
+  <el-button type="text" size="mini" @click.stop="edit()" :disabled="!disabled">编辑</el-button>
 </template>
 
 <script>
@@ -11,7 +11,7 @@ export default {
   },
   computed: {
   },
-  props: ['fileData'],
+  props: ['fileData','disabled'],
   watch: {
   },
   methods: {

src/SManagement/archives_ad/components/delete.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="delete">
-  <el-button :disabled="data.isAuth == 0" type="text" size="mini" @click.stop="dialogVisible = true">删除</el-button>
+  <el-button :disabled="!disabled" type="text" size="mini" @click.stop="dialogVisible = true">删除</el-button>
   <el-dialog append-to-body title="提示" :visible.sync="dialogVisible" width="30%">
     <span>是否永久删除素材?</span>
     <span slot="footer" class="dialog-footer">
@@ -20,7 +20,7 @@ export default {
       dialogVisible:false
     };
   },
-  props:['data'],
+  props:['data','disabled'],
   computed:{
   },
   watch:{

src/SManagement/archives_ad/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="normal-card">
       <!-- 搜索及分类筛选 -->
-      <filterList @changeTypeId="changeTypeId" @startSearch="startSearch">
+      <filterList :customParam="select" @changeTypeId="changeTypeId" @startSearch="startSearch">
         <span style="flex: 1;display: flex;justify-content: flex-end;">
           <hot-new-control @sortTypeChange="sortTypeChange" />
         </span>
@@ -57,7 +57,6 @@ export default {
       //列表数据
       list: [],
       //分类列表
-      selectList: [],
       total: 0,
       //当前查看的素材
       currentFile: ''
@@ -78,7 +77,6 @@ export default {
   },
   created() {
     this.getFileList()
-    this.getSelectList()
   },
   methods: {
     //获取文件数据
@@ -123,12 +121,6 @@ export default {
         if (res.msg == '成功') this.getList();
       })
     },
-    //获取分类列表
-    getSelectList() {
-      this.$api.requested(this.select).then(res => {
-        this.selectList = res.data
-      })
-    },
     sortTypeChange(name) {
       for (let i = 0; i < this.params.content.sort.length; i++) {
         this.params.content.sort[i].sorted = this.params.content.sort[i].sortname == name ? 1 : 0

src/SManagement/archives_admag/index.vue

@@ -22,7 +22,7 @@
               </el-select>
             </div>
             <!-- 搜索及分类筛选 -->
-            <filterList @changeTypeId="changeTypeId" @startSearch="startSearch">
+            <filterList id="sat_sharematerial_classid" :customParam="select" @changeTypeId="changeTypeId" @startSearch="startSearch">
               <!-- <span style="flex: 1;display: flex;justify-content: flex-end;">
                 <hot-new-control @sortTypeChange="sortTypeChange" />
               </span> -->
@@ -33,10 +33,10 @@
           <list :fileData="fileData" @listItemClick="listItemClick"
             v-if="tool.checkAuth($route.name, 'read')">
             <template v-slot:edit="scope">
-              <Edit :fileData="scope.data" v-if="tool.checkAuth($route.name, 'update') && scope.data.isAuth"></Edit>
+              <Edit :fileData="scope.data" :disabled="tool.checkAuth($route.name, 'update') && scope.data.isAuth"></Edit>
             </template>
             <template v-slot:delete="scope">
-              <Delete :data="scope.data" @removeSuccess="getFileList" v-if="tool.checkAuth($route.name, 'delete') && scope.data.isAuth"></Delete>
+              <Delete :data="scope.data" @removeSuccess="getFileList"  :disabled="tool.checkAuth($route.name, 'delete') && scope.data.isAuth"></Delete>
             </template>
           </list>
           <pagination :total="total" :pageSize="params.content.pageSize" :currentPage="params.content.pageNumber"
@@ -118,7 +118,6 @@ export default {
       //列表数据
       list: [],
       //分类列表
-      selectList: [],
       total: 0,
       //当前查看的素材
       currentFile: ''
@@ -143,7 +142,6 @@ export default {
   },
   created() {
     this.getFileList()
-    this.getSelectList()
   },
   methods: {
     inputChange () {
@@ -193,11 +191,6 @@ export default {
         if (res.msg == '成功') this.getFileList()
       })
     },
-    //获取分类列表
-    async getSelectList() {
-      let res = await this.$api.requested(this.select)
-      this.selectList = res.data
-    },
     sortTypeChange(name) {
       for (let i = 0; i < this.params.content.sort.length; i++) {
         this.params.content.sort[i].sorted = this.params.content.sort[i].sortname == name ? 1 : 0

src/SManagement/archives_sc/index.vue

@@ -3,7 +3,7 @@
     <div slot="content">
       <div class="normal-card">
         <!-- 搜索及分类筛选 -->
-        <filterList @changeTypeId="changeTypeId" @startSearch="startSearch">
+        <filterList id="sat_courseware_classid" @changeTypeId="changeTypeId" @startSearch="startSearch">
         </filterList>
         <!--课件列表-->
         <div class="file" v-if="list.length != 0 && tool.checkAuth($route.name,'read')">

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

@@ -136,6 +136,7 @@ export default {
           "systemappid":this.systemappid,
         }
       })
+      
       this.reportCenterLsit = res.data
       console.log(res,'报表数据');
     },
@@ -149,7 +150,7 @@ export default {
       })
       this.tool.showMessage(res,() => {
         
-        window.open(this.$baseUrl + res.data + `&${this.idname}=${data}`)  
+        window.open(this.tool.getBaseUrl() + res.data + `&${this.idname}=${data}`)  
       })
     },
     next () {

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

@@ -276,7 +276,7 @@ export default {
         }
       })
       this.tool.showMessage(res,() => {
-        window.open(this.$baseUrl + res.data + `&${this.idName}=${data[this.idName]}`)  
+        window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${data[this.idName]}`)  
       })
     },
     clearSearchValue () {

src/main.js

@@ -24,15 +24,12 @@ import deleteBtn from './components/delete_btn/index'
 import customBtn from './components/customBtn/index'
 import tagPanl from '@/components/tagPanl/tagPanl'
 
-
 import sort from './components/sort'
 import '@/style/theme/font-icon/iconfont.css'
 // import {hiPrintPlugin} from './index'
 // Vue.use(hiPrintPlugin)
 Vue.prototype.$api = api
-
-Vue.prototype.$baseUrl = 'http://61.164.207.46:8000'
-
+console.log(process.env)
 Vue.prototype.$upload = upload
 
 Vue.prototype.tool = tool

src/utils/tool.js

@@ -61,6 +61,20 @@ export default {
     });
     success?success():''
   },
+  /* 获取基本地址 */
+  getBaseUrl () {
+    if (process.env.NODE_ENV == 'development') return 'http://122.226.136.204:8082'
+    let href = window.location.href
+    let index = href.indexOf('/')
+    let num = 0
+    while (index != -1) {
+      num++
+      index = href.indexOf('/',index+1)
+      if (num++ == 3) {
+        return href.slice(0,index)
+      } 
+    }
+  },
   // 处理省市县数据结构
   createMenu (node) {
     var that = this