Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

renkang

2025-01-10 5259bd0cab1aa4c3551ba5c0d3d15d156c087a80

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

 admin/src/views/finance/account.vue

@@ -9,7 +9,7 @@
      <el-table-column prop="title" label="收支条目" min-width="100" show-overflow-tooltip />
      <el-table-column prop="companyName" label="收款公司" min-width="100" show-overflow-tooltip />
      <el-table-column label="账户类型" min-width="100" show-overflow-tooltip>
        <template v-slot="{row}">
        <template v-slot="{ row }">
          <span v-if="row.type == 0">对公</span>
          <span v-if="row.type == 1">个人</span>
        </template>
@@ -19,7 +19,8 @@
      <el-table-column prop="bankNo" label="银行账号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="status" label="状态" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <el-switch v-model="scope.row.status" @change="e =>changeStatus(scope.row)" :active-value="0" :inactive-value="1">
          <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0"
            :inactive-value="1">
          </el-switch>
        </template>
      </el-table-column>
@@ -117,13 +118,13 @@
        this.getList()
      })
    },
    getCompany(){
    getCompany() {
      companyGetList({
        model: {type: 2},
        model: { type: 2 },
        capacity: 9999,
        page: 1
      }).then(res => {
       this.queryFormConfig.formItems[1].options = res.records || []
        this.queryFormConfig.formItems[1].options = res.records || []
      })
    },
    handleEdit(row) {
@@ -156,6 +157,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/finance/collectionSettings.vue

@@ -1,10 +1,59 @@
<template>
    
    <div class="box">
        <div class="content">
            <div class="content_form">
                <el-form ref="form" :model="form" label-width="120px">
                    <el-form-item label="短信模板">
                        <div style="display: flex; align-items: self-start;">
                            <el-input type="textarea" rows="5" v-model="form.desc"></el-input>
                            <el-button type="primary" style="margin-left: 10px;">保存</el-button>
                        </div>
                    </el-form-item>
                    <el-form-item label="邮箱模板">
                        <div style="display: flex; align-items: self-start;">
                            <el-input type="textarea" rows="5" v-model="form.desc"></el-input>
                            <el-button type="primary" style="margin-left: 10px;">保存</el-button>
                        </div>
                    </el-form-item>
                </el-form>
            </div>
            <el-button @click="$refs.templateKeywords.open('模板关键字')">模板关键字</el-button>
        </div>
        <templateKeywords ref="templateKeywords" />
    </div>
</template>

<script>
    import templateKeywords from './components/templateKeywords'
  export default {
    name: 'collectionSettings'
    name: 'collectionSettings',
    data() {
      return {
        form: {
          desc: ''
        }
      }
    },
    components: { templateKeywords }
  }
</script>

<style lang="scss" scoped>
    .box {
        width: 100%;
        padding: 20px;
        box-sizing: border-box;
        .content {
            width: 100%;
            padding: 20px;
            box-sizing: border-box;
            background: #ffffff;
            display: flex;
            align-items: self-start;
            justify-content: space-between;
            .content_form {
                width: 60%;
            }
        }
    }
</style>

 admin/src/views/finance/company.vue

@@ -13,7 +13,8 @@
      <el-table-column prop="accountNum" label="收支账户数量" min-width="100" show-overflow-tooltip />
      <el-table-column prop="status" label="状态" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0" :inactive-value="1">
          <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0"
            :inactive-value="1">
          </el-switch>
        </template>
      </el-table-column>
@@ -132,6 +133,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/finance/components/templateKeywords.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
<template>
    <GlobalWindow
        :title="title"
        :visible.sync="visible"
        width="100%">
        <div class="main">
            <div class="title">账单信息</div>
            <div class="list">
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${费用名称}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${计费周期}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单价}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单位}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${应收日期}</el-tag>
            </div>
            <div class="title">合同信息</div>
            <div class="list">
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${费用名称}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${计费周期}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单价}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单位}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${应收日期}</el-tag>
            </div>
            <div class="title">其他信息</div>
            <div class="list">
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${费用名称}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${计费周期}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单价}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${单位}</el-tag>
                <el-tag type="info" size="medium" effect="plain" style="margin-right: 10px;">${应收日期}</el-tag>
            </div>
        </div>
    </GlobalWindow>
</template>

<script>
  import GlobalWindow from '@/components/common/GlobalWindow'
  import BaseOpera from '@/components/base/BaseOpera'
  export default {
    name: "templateKeywords",
    components: { GlobalWindow },
    extends: BaseOpera,
    data() {
      return {
      
      }
    },
    methods: {

    }
  }
</script>

<style lang="scss" scoped>
    @import '@/assets/style/variables.scss';
    .main {
        padding-top: 20px;
        box-sizing: border-box;
        .title {
            font-weight: 500;
            font-size: 18px;
            color: $primary-color;
            margin-bottom: 15px;
        }
        
        .list {
            display: flex;
            flex-wrap: wrap;
            border-radius: 2px;
            margin-bottom: 30px;
        }
    }
</style>

 admin/src/views/finance/payments.vue

@@ -2,7 +2,7 @@
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
    <div class="mt20">
<!--      <el-button v-permissions="['business:ywpatrolline:create']">导出</el-button>-->
      <!--      <el-button v-permissions="['business:ywpatrolline:create']">导出</el-button>-->
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="customerName" label="客户名称" min-width="100" show-overflow-tooltip />
@@ -10,7 +10,7 @@
      <el-table-column label="房号" min-width="100" show-overflow-tooltip>
        <template slot-scope="{row}">
          <div style="display: flex; flex-direction: column;" v-if="row.roomPathName">
            <span v-for="(item, index) in row.roomPathName.split(';')" :key="index">{{item}}</span>
            <span v-for="(item, index) in row.roomPathName.split(';')" :key="index">{{ item }}</span>
          </div>
        </template>
      </el-table-column>
@@ -123,7 +123,7 @@
    this.getList()
  },
  methods: {
    isShow (status, contractStatus) {
    isShow(status, contractStatus) {
      if (status === 1) return false
      if (contractStatus === '3' || contractStatus === '4') return false
      return true
@@ -150,7 +150,7 @@
        this.loading = false
      })
    },
    closeDW (id) {
    closeDW(id) {
      this.$confirm('确认关闭此流水吗?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -161,8 +161,8 @@
            this.getList()
          })
      }).catch(() => {
      
      });

      })
    },
    handleDel(row) {
      let message = `确认删除该记录吗?`
@@ -185,6 +185,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/operation/device.vue

@@ -21,7 +21,8 @@
      </el-table-column>
      <el-table-column label="操作" min-width="130" fixed="right">
        <template slot-scope="{row}">
          <el-button type="text" @click="handleDetail(row)" v-permissions="['business:category:update']">查看详情</el-button>
          <el-button type="text" @click="handleDetail(row)"
            v-permissions="['business:category:update']">查看详情</el-button>
          <el-button type="text" @click="handleEdit(row)" icon="el-icon-edit"
            v-permissions="['business:category:update']">编辑</el-button>
          <el-button type="text" @click="handleDel(row)" icon="el-icon-delete"
@@ -146,6 +147,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/statistics/platformRecord.vue

@@ -9,8 +9,7 @@
      <el-table-column prop="param1" label="作业开始" min-width="100" show-overflow-tooltip />
      <el-table-column prop="param2" label="作业结束" min-width="100" show-overflow-tooltip />
      <el-table-column prop="workTime" label="作业时长" min-width="100" show-overflow-tooltip />
      <el-table-column prop="name"
        label="运输单号/合同号" min-width="100" show-overflow-tooltip>
      <el-table-column prop="name" label="运输单号/合同号" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
        </template>
@@ -131,6 +130,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/statistics/platformStatic.vue

@@ -130,6 +130,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/stock/InventoryQuery.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,92 @@
<template>
    <TableLayout :permissions="['business:ywroom:query']">
        <!-- æœç´¢è¡¨å• -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
            <el-form-item label="仓库" prop="buildingId">
                <el-select v-model="searchForm.buildingId" placeholder="请选择楼宇" clearable>
                    <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="资产名称/编码" prop="roomNum">
                <el-input v-model="searchForm.roomNum" placeholder="请输入房号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="型号" prop="roomNum">
                <el-input v-model="searchForm.roomNum" placeholder="请输入房号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:ywroom:create', 'business:ywroom:delete']">
                <li><el-button>导出</el-button></li>
            </ul>
            <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
                <el-table-column prop="projectName" label="资产编号" min-width="100px"></el-table-column>
                <el-table-column prop="buildingName" label="资产名称" min-width="70px"></el-table-column>
                <el-table-column prop="floorName" label="条码" min-width="60px"></el-table-column>
                <el-table-column prop="roomNum" label="品牌" min-width="60px"></el-table-column>
                <el-table-column prop="rentArea" label="规格型号" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="所在仓库" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="库存" min-width="80px"></el-table-column>
            </el-table>
            <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
            </pagination>
        </template>
    </TableLayout>
</template>

<script>
  import BaseTable from '@/components/base/BaseTable'
  import TableLayout from '@/layouts/TableLayout'
  import Pagination from '@/components/common/Pagination'
  export default {
    name: 'InventoryQuery',
    extends: BaseTable,
    components: { TableLayout, Pagination },
    data() {
      return {
        // æœç´¢
        searchForm: {
          id: '',
          creator: '',
          createDate: '',
          editor: '',
          editDate: '',
          isdeleted: '',
          name: '',
          remark: '',
          status: '',
          sortnum: '',
          imgurl: '',
          code: '',
          roomNum: '',
          isInvestment: '',
          area: '',
          feeArea: '',
          rentArea: '',
          floor: '',
          projectId: '',
          buildingId: ''
        },
        projectList: [],
        buildList: [],

        filters: {}
      }
    },
    created() {
      this.config({
        module: '运维房源信息表',
        api: '/project/ywRoom',
        'field.id': 'id',
        'field.main': 'id'
      })
    },
    methods: {
    
    }
  }
</script>

 admin/src/views/stock/asset.vue

@@ -12,7 +12,7 @@
      <el-table-column prop="param1" label="备注" min-width="120" show-overflow-tooltip />
      <el-table-column prop="param2" label="状态" min-width="90" show-overflow-tooltip />
      <el-table-column prop="workTime" label="操作" min-width="100" show-overflow-tooltip>
        <template v-slot="{row}">
        <template v-slot="{ row }">
          <span class="primaryColor pointer">查看详情</span>
          <span class="red pointer">删除</span>
        </template>
@@ -49,7 +49,7 @@
      total: 0,
      queryFormConfig: {
        formItems: [
        {
          {
            filed: 'carCodeFront',
            type: 'input',
            label: '仓库名称',
@@ -123,11 +123,10 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}
</script>

<style>

</style>
<style></style>

 admin/src/views/stock/assetCate.vue

@@ -9,7 +9,7 @@
      </ul>
      <el-table row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
        :data="dataList" stripe @selection-change="handleSelectionChange">
        <el-table-column prop="name" label="设备分类" min-width="100px"></el-table-column>
        <el-table-column prop="name" label="资产分类" min-width="100px"></el-table-column>
        <!-- <el-table-column prop="parentName" label="所属分类" min-width="100px"></el-table-column> -->
        <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
        <el-table-column v-if="containPermissions(['business:category:update', 'business:category:delete'])" label="操作"
@@ -68,7 +68,7 @@
  methods: {
    handleEdit(row) {
      this.isShowEdit = true
      let str = row && row.id ? '编辑设备分类' : '新建设备分类'
      let str = row && row.id ? '编辑资产分类' : '新建资产分类'
      this.$nextTick(() => {
        this.$refs.CateEditRef.open(str)
        this.$refs.CateEditRef.getList()

 admin/src/views/stock/assetList.vue

@@ -132,6 +132,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/stock/assetManagement.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
<template>
    <TableLayout>
        <template v-slot:table-wrap>
            <ul class="toolbar">
                <li><el-button type="primary" icon="el-icon-plus" @click="$refs.newAsset.open('新建资产分类')">新建</el-button></li>
            </ul>
            <el-table row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
                :data="dataList" stripe>
                <el-table-column prop="name" label="资产分类" min-width="100px"></el-table-column>
                <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
                <el-table-column label="操作" min-width="120" fixed="right">
                    <template slot-scope="{row}">
                        <el-button type="text" icon="el-icon-edit">编辑</el-button>
                        <el-button type="text" icon="el-icon-delete">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            ></pagination>
        </template>
        <newAsset ref="newAsset" />
    </TableLayout>
</template>

<script>
  import BaseTable from '@/components/base/BaseTable'
  import TableLayout from '@/layouts/TableLayout'
  import Pagination from '@/components/common/Pagination'
  import newAsset from './components/newAsset'
  export default {
    name: 'assetManagement',
    extends: BaseTable,
    components: { TableLayout, Pagination, newAsset },
    data() {
      return {
        dataList: []
      }
    },
    created() {
      this.config({
        module: '车辆信息表',
        api: '/business/category',
        'field.id': 'id',
        'field.main': 'id'
      })
    },
    methods: {
    
    }
  }
</script>

 admin/src/views/stock/check.vue

@@ -13,7 +13,7 @@
      <el-table-column prop="param2" label="创建时间" min-width="140" show-overflow-tooltip />
      <el-table-column prop="workTime" label="盘点状态" min-width="80" show-overflow-tooltip />
      <el-table-column prop="workTime" label="操作" min-width="140" show-overflow-tooltip>
        <template v-slot="{row}">
        <template v-slot="{ row }">
          <span class="primaryColor pointer">查看详情</span>
          <span class="primaryColor pointer">取消</span>
          <span class="primaryColor pointer">删除</span>
@@ -51,7 +51,7 @@
      total: 0,
      queryFormConfig: {
        formItems: [
        {
          {
            filed: 'carCodeFront',
            type: 'input',
            label: '盘点单',
@@ -125,11 +125,10 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}
</script>

<style>

</style>
<style></style>

 admin/src/views/stock/components/AssetSel.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,125 @@
<template>
  <GlobalWindow title="选择物料" :visible.sync="isShowModal" :confirm-working="isLoading" width="900px" @close="close"
    @confirm="confirm">
    <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
      <el-form-item prop="areaType" label="物料信息">
        <el-input v-model="searchForm.aaa" placeholder="请输入物料编码/名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item prop="areaIds" label="物料分类">
        <el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="请选择物料分类" clearable
          :options="cateList" :props="{
            label: 'name',
            value: 'id',
            children: 'childCategoryList'
          }"></el-cascader>
      </el-form-item>
      <span>
        <el-button type="primary" @click="getList">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </span>
    </el-form>
    <!--  -->
    <el-table @selection-change="handleSelectionChange" :data="list" stripe>
      <el-table-column type="selection"  width="55" />
      <el-table-column prop="categoryName" label="物料编码" min-width="100px"></el-table-column>
      <el-table-column prop="creatorName" label="物料名称" min-width="80px"></el-table-column>
      <el-table-column prop="createDate" label="条码" min-width="100px"></el-table-column>
      <el-table-column prop="dealUserName" label="品牌" min-width="80px"></el-table-column>
      <el-table-column prop="dealUserName" label="规格型号" min-width="80px"></el-table-column>
      <el-table-column prop="dealUserName" label="单位" min-width="80px"></el-table-column>
      <el-table-column prop="dealUserName" label="库存" min-width="80px"></el-table-column>
    </el-table>
    <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination">
    </Pagination>
  </GlobalWindow>
</template>

<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import Pagination from '@/components/common/Pagination'
import { fetchList as getCateList } from '@/api/business/category.js'
export default {
  name: 'OperaCategoryWindow',
  components: { GlobalWindow, Pagination },
  data() {
    return {
      // è¡¨å•æ•°æ®
      searchForm: {},
      pagination: {
        pageSize: 10,
        page: 1,
        total: 0
      },
      list: [],
      selList: [],
      cateList: [],
      isShowModal: false,
      isLoading: false,
      // éªŒè¯è§„则
      rules: {
        name: [{ required: true, message: '请输入二级分类名称', trigger: 'blur' }],
      },
      dataList: []
    }
  },
  created() {
    this.initData()
  },
  methods: {
    confirm() {
      this.$emit('change', this.selList)
      this.close()
    },
    handleSelectionChange(val) {
      this.selList = val
    },
    getList(page) {
      const { pagination, searchForm } = this
      this.listLoading = true
      if(page){pagination.page = page}
      fetchList({
        capacity: pagination.pageSize,
        page: pagination.page,
        model: {...searchForm}
      }).then((res) => {
        this.listLoading = false
        this.list = res.records
        this.pagination.total = res.total || 0
      }, () => {
        this.listLoading = false
      })
    },
    initData() {
      getCateList({
        model: { type: 3 },
        capacity: 1000,
        page: 1,
      }).then(res => {
        this.cateList = res.records || []
      })
    },
    changeSel(e) {
      if (e && e.length == 2) {
        this.$set(this.searchForm, 'cateId', e[1])
      } else {
        this.$set(this.searchForm, 'cateId', '')
      }
    },
    reset() {
      this.searchForm = {}
      this.pagination.pageSize = 10
      this.pagination.page = 1
      this.getList()
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    },
    close() {
      this.isShowModal = false
      this.$emit('close')
    },
  }
}
</script>

 admin/src/views/stock/components/InDetail.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,164 @@
<template>
  <GlobalWindow width="960px" title="出库单详情" :visible.sync="visible" :confirm-working="isWorking" @close="close"
    @confirm="confirm">
    <div class="main">
      <div class="title">
        <span>工单详情</span>
      </div>
      <div class="main_content">
        <div class="list">
          <div class="item">
            <div class="la">出库仓库</div>
            <div class="val">{{ info.projectName }}</div>
          </div>
          <div class="item">
            <div class="la">出库日期</div>
            <div class="val">{{ info.categoryName }}</div>
          </div>
          <div class="item">
            <div class="la">出库类型</div>
            <div class="val">{{ info.creatorName }}{{ info.creatorCompany ? "-" + info.creatorCompany : '' }}</div>
          </div>
          <div class="item">
            <div class="la">处理人</div>
            <div class="val">{{ info.creatorPhone || info.creatorMobile }}</div>
          </div>
          <div class="item">
            <div class="la">备注</div>
            <div class="val">{{ info.createDate }}</div>
          </div>
        </div>
      </div>
      <div class="title">物料信息</div>
      <el-table :data="list" stripe>
        <el-table-column align="center" type="index" width="55" />
        <el-table-column prop="creatorName" label="物料名称" show-overflow-tooltip min-width="80px"></el-table-column>
        <el-table-column prop="categoryName" label="物料编码" show-overflow-tooltip min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="条形码" show-overflow-tooltip min-width="100px"></el-table-column>
        <el-table-column prop="dealUserName" label="品牌" show-overflow-tooltip min-width="80px"></el-table-column>
        <el-table-column prop="dealUserName" label="单位" show-overflow-tooltip min-width="80px"></el-table-column>
        <el-table-column prop="dealUserName" label="出库数量" show-overflow-tooltip min-width="80px"></el-table-column>
      </el-table>
    </div>
  </GlobalWindow>
</template>

<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import { detailById, dispatchOrder, dealOrder } from '@/api/workorder/ywWorkorder'
import { getUserList } from '@/api/system/user'
import { Message, Loading } from 'element-ui'
import dayjs from 'dayjs'
export default {
  components: {
    GlobalWindow
  },
  extends: BaseOpera,
  data() {
    return {
      id: '',
      visible: false,
      info: {},
      list: []


    }
  },
  created() {
    // this.getDetail()
  },
  methods: {
    getDetail() {
      const { id } = this
      detailById(id).then(res => {
        this.info = res
      })
    },
    close() {
      this.visible = false
      this.$emit('close')
    }
  }
}
</script>

<style lang="scss" scoped>
@import '@/assets/style/variables.scss';

.main {
  padding-top: 20px;

  .title {
    font-weight: 500;
    font-size: 18px;
    color: $primary-color;
    margin-bottom: 10px;
    display: flex;
    align-items: center;

    .status {
      padding: 0 12px;
      height: 24px;
      line-height: 24px;
      border-radius: 2px;
      border: 1px solid #00BA92;
      color: #00BA92;
      font-weight: 400;
      font-size: 12px;
      margin-left: 10px;
    }

    .primaryColor {
      border: 1px solid rgba(63, 126, 239, .2);
      background-color: rgba(63, 126, 239, .2);
    }

    .green {
      background-color: rgba(83, 183, 148, .2);
      border: 1px solid rgba(83, 183, 148, .2);
    }

    .gray {
      color: #333333;
      background-color: rgba(128, 128, 128, .2);
      border: 1px solid rgba(128, 128, 128, .2);
    }
  }

  .list {
    display: flex;
    flex-wrap: wrap;
    /* background: #F7F7F7; */
    border-radius: 2px;
    padding: 15px 20px;
    margin-bottom: 16px;

    .item {
      width: 33.3%;
      margin-bottom: 14px;

      .la {
        color: #7f7f7f;
        margin-bottom: 6px;
      }
    }

    .item2 {
      width: 100%;
      display: flex;
      align-items: center;

      .la {
        margin-bottom: 0;
        width: 72px;
      }
    }

    .max {
      width: 100%;
    }
  }

}
</style>

 admin/src/views/stock/components/InEdit.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
<template>
  <GlobalWindow title="新建出库单" :visible.sync="isShowModal" :confirm-working="isLoading" width="900px" @close="close"
    @confirm="confirm">
    <el-form :model="param" ref="form" :rules="rules">
      <div class="df_ac">
        <el-form-item class="w3" label="出库仓库" prop="parentId">
          <el-select :disabled="param.id" v-model="param.parentId" placeholder="不填为则一级分类">
            <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item class="w3" label="出库日期">
          <el-date-picker type="date" v-model="param.getDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
            placeholder="请选择出库日期"></el-date-picker>
        </el-form-item>
        <el-form-item class="w3" label="出库类型" prop="parentId">
          <el-select :disabled="param.id" v-model="param.parentId" placeholder="不填为则一级分类">
            <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item class="w3" label="处理人" prop="name">
          <el-input v-model="param.name" v-trim />
        </el-form-item>
        <el-form-item class="w6" label="备注" prop="name">
          <el-input v-model="param.name" placeholder="请输入" v-trim />
        </el-form-item>
      </div>
    </el-form>
    <!--  -->
    <el-tabs v-model="activeName">
      <el-tab-pane label="物料信息" name="first"></el-tab-pane>
    </el-tabs>
    <el-button type="primary" @click="handleOpenMaterial">选择物料</el-button>
    <el-table :data="list" stripe>
      <el-table-column align="center" label="序号" type="index" width="50" />
      <el-table-column prop="creatorName" label="物料名称" show-overflow-tooltip min-width="80px"></el-table-column>
      <el-table-column prop="categoryName" label="物料编码" show-overflow-tooltip min-width="90px"></el-table-column>
      <el-table-column prop="createDate" label="条形码" show-overflow-tooltip min-width="70px"></el-table-column>
      <el-table-column prop="dealUserName" label="品牌" show-overflow-tooltip min-width="70px"></el-table-column>
      <el-table-column prop="dealUserName" label="单位" show-overflow-tooltip min-width="70px"></el-table-column>
      <el-table-column prop="dealUserName" label="出库数量" min-width="90px">
        <template v-slot="{row}">
          <el-input oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 11)" v-model="row.aa" class="w100"></el-input>
        </template>
      </el-table-column>
      <el-table-column prop="dealUserName" label="库存数量" show-overflow-tooltip min-width="80px"></el-table-column>
      <el-table-column prop="dealUserName" label="操作" min-width="60px">
        <template v-slot="scope">
          <span @click="handleDel(scope)" class="red pointer">删除</span>
        </template>
      </el-table-column>
    </el-table>
    <!--  -->
    <AssetSel v-if="isShowSel" ref="AssetSelRef" @change="changeSel" @close="isShowSel = false" />
  </GlobalWindow>
</template>

<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import AssetSel from './AssetSel'
import { create, fetchCateList, getInfoById } from '@/api/business/category.js'
export default {
  name: 'OperaCategoryWindow',
  components: { GlobalWindow, AssetSel },
  data() {
    return {
      // è¡¨å•æ•°æ®
      param: {},
      activeName: 'first',
      isShowModal: false,
      isShowSel: false,
      isLoading: false,
      // éªŒè¯è§„则
      rules: {
        name: [{ required: true, message: '请输入二级分类名称', trigger: 'blur' }],
      },
      list: [{}],

      dataList: [],
    }
  },
  created() {

  },
  methods: {
    confirm() {

    },
    getList() {
      fetchCateList({ type: 5 }).then(res => {
        this.dataList = res || []

      })
    },
    changeSel() {

    },
    handleDel(val) {
      const index = val.$index
      this.list.splice(index, 1)
      
    },
    handleOpenMaterial() {
      this.isShowSel = true
      this.$nextTick(() => {
        this.$refs.AssetSelRef.isShowModal = true
      })
    },
    close() {
      this.isShowModal = false
      this.$emit('close')
    },
    getDetail(id) {
      getInfoById(id).then(res => {
        this.param = res
      })
    },
  }
}
</script>
<style lang="scss" scoped>
.df_ac {
  display: flex;
  align-items: center;
  flex-wrap: wrap;

  .w3 {
    width: 33.3%;
    padding: 0 10px;
    box-sizing: border-box;
  }

  .w6 {
    width: 66.6%;
    padding: 0 10px;
    box-sizing: border-box;
  }
}
</style>

 admin/src/views/stock/components/OutDetail.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,164 @@
<template>
  <GlobalWindow width="960px" title="出库单详情" :visible.sync="visible" :confirm-working="isWorking" @close="close"
    @confirm="confirm">
    <div class="main">
      <div class="title">
        <span>工单详情</span>
      </div>
      <div class="main_content">
        <div class="list">
          <div class="item">
            <div class="la">出库仓库</div>
            <div class="val">{{ info.projectName }}</div>
          </div>
          <div class="item">
            <div class="la">出库日期</div>
            <div class="val">{{ info.categoryName }}</div>
          </div>
          <div class="item">
            <div class="la">出库类型</div>
            <div class="val">{{ info.creatorName }}{{ info.creatorCompany ? "-" + info.creatorCompany : '' }}</div>
          </div>
          <div class="item">
            <div class="la">处理人</div>
            <div class="val">{{ info.creatorPhone || info.creatorMobile }}</div>
          </div>
          <div class="item">
            <div class="la">备注</div>
            <div class="val">{{ info.createDate }}</div>
          </div>
        </div>
      </div>
      <div class="title">物料信息</div>
      <el-table :data="list" stripe>
        <el-table-column align="center" type="index" width="55" />
        <el-table-column prop="creatorName" label="物料名称" show-overflow-tooltip min-width="80px"></el-table-column>
        <el-table-column prop="categoryName" label="物料编码" show-overflow-tooltip min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="条形码" show-overflow-tooltip min-width="100px"></el-table-column>
        <el-table-column prop="dealUserName" label="品牌" show-overflow-tooltip min-width="80px"></el-table-column>
        <el-table-column prop="dealUserName" label="单位" show-overflow-tooltip min-width="80px"></el-table-column>
        <el-table-column prop="dealUserName" label="出库数量" show-overflow-tooltip min-width="80px"></el-table-column>
      </el-table>
    </div>
  </GlobalWindow>
</template>

<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import { detailById, dispatchOrder, dealOrder } from '@/api/workorder/ywWorkorder'
import { getUserList } from '@/api/system/user'
import { Message, Loading } from 'element-ui'
import dayjs from 'dayjs'
export default {
  components: {
    GlobalWindow
  },
  extends: BaseOpera,
  data() {
    return {
      id: '',
      visible: false,
      info: {},
      list: []


    }
  },
  created() {
    // this.getDetail()
  },
  methods: {
    getDetail() {
      const { id } = this
      detailById(id).then(res => {
        this.info = res
      })
    },
    close() {
      this.visible = false
      this.$emit('close')
    }
  }
}
</script>

<style lang="scss" scoped>
@import '@/assets/style/variables.scss';

.main {
  padding-top: 20px;

  .title {
    font-weight: 500;
    font-size: 18px;
    color: $primary-color;
    margin-bottom: 10px;
    display: flex;
    align-items: center;

    .status {
      padding: 0 12px;
      height: 24px;
      line-height: 24px;
      border-radius: 2px;
      border: 1px solid #00BA92;
      color: #00BA92;
      font-weight: 400;
      font-size: 12px;
      margin-left: 10px;
    }

    .primaryColor {
      border: 1px solid rgba(63, 126, 239, .2);
      background-color: rgba(63, 126, 239, .2);
    }

    .green {
      background-color: rgba(83, 183, 148, .2);
      border: 1px solid rgba(83, 183, 148, .2);
    }

    .gray {
      color: #333333;
      background-color: rgba(128, 128, 128, .2);
      border: 1px solid rgba(128, 128, 128, .2);
    }
  }

  .list {
    display: flex;
    flex-wrap: wrap;
    /* background: #F7F7F7; */
    border-radius: 2px;
    padding: 15px 20px;
    margin-bottom: 16px;

    .item {
      width: 33.3%;
      margin-bottom: 14px;

      .la {
        color: #7f7f7f;
        margin-bottom: 6px;
      }
    }

    .item2 {
      width: 100%;
      display: flex;
      align-items: center;

      .la {
        margin-bottom: 0;
        width: 72px;
      }
    }

    .max {
      width: 100%;
    }
  }

}
</style>

 admin/src/views/stock/components/OutEdit.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
<template>
  <GlobalWindow title="新建出库单" :visible.sync="isShowModal" :confirm-working="isLoading" width="900px" @close="close"
    @confirm="confirm">
    <el-form :model="param" ref="form" :rules="rules">
      <div class="df_ac">
        <el-form-item class="w3" label="出库仓库" prop="parentId">
          <el-select :disabled="param.id" v-model="param.parentId" placeholder="不填为则一级分类">
            <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item class="w3" label="出库日期">
          <el-date-picker type="date" v-model="param.getDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
            placeholder="请选择出库日期"></el-date-picker>
        </el-form-item>
        <el-form-item class="w3" label="出库类型" prop="parentId">
          <el-select :disabled="param.id" v-model="param.parentId" placeholder="不填为则一级分类">
            <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item class="w3" label="处理人" prop="name">
          <el-input v-model="param.name" v-trim />
        </el-form-item>
        <el-form-item class="w6" label="备注" prop="name">
          <el-input v-model="param.name" placeholder="请输入" v-trim />
        </el-form-item>
      </div>
    </el-form>
    <!--  -->
    <el-tabs v-model="activeName">
      <el-tab-pane label="物料信息" name="first"></el-tab-pane>
    </el-tabs>
    <el-button type="primary" @click="handleOpenMaterial">选择物料</el-button>
    <el-table :data="list" stripe>
      <el-table-column align="center" label="序号" type="index" width="50" />
      <el-table-column prop="creatorName" label="物料名称" show-overflow-tooltip min-width="80px"></el-table-column>
      <el-table-column prop="categoryName" label="物料编码" show-overflow-tooltip min-width="90px"></el-table-column>
      <el-table-column prop="createDate" label="条形码" show-overflow-tooltip min-width="70px"></el-table-column>
      <el-table-column prop="dealUserName" label="品牌" show-overflow-tooltip min-width="70px"></el-table-column>
      <el-table-column prop="dealUserName" label="单位" show-overflow-tooltip min-width="70px"></el-table-column>
      <el-table-column prop="dealUserName" label="出库数量" min-width="90px">
        <template v-slot="{row}">
          <el-input oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 11)" v-model="row.aa" class="w100"></el-input>
        </template>
      </el-table-column>
      <el-table-column prop="dealUserName" label="库存数量" show-overflow-tooltip min-width="80px"></el-table-column>
      <el-table-column prop="dealUserName" label="操作" min-width="60px">
        <template v-slot="scope">
          <span @click="handleDel(scope)" class="red pointer">删除</span>
        </template>
      </el-table-column>
    </el-table>
    <!--  -->
    <AssetSel v-if="isShowSel" ref="AssetSelRef" @change="changeSel" @close="isShowSel = false" />
  </GlobalWindow>
</template>

<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import AssetSel from './AssetSel'
import { create, fetchCateList, getInfoById } from '@/api/business/category.js'
export default {
  name: 'OperaCategoryWindow',
  components: { GlobalWindow, AssetSel },
  data() {
    return {
      // è¡¨å•æ•°æ®
      param: {},
      activeName: 'first',
      isShowModal: false,
      isShowSel: false,
      isLoading: false,
      // éªŒè¯è§„则
      rules: {
        name: [{ required: true, message: '请输入二级分类名称', trigger: 'blur' }],
      },
      list: [{}],

      dataList: [],
    }
  },
  created() {

  },
  methods: {
    confirm() {

    },
    getList() {
      fetchCateList({ type: 5 }).then(res => {
        this.dataList = res || []

      })
    },
    changeSel() {

    },
    handleDel(val) {
      const index = val.$index
      this.list.splice(index, 1)
      
    },
    handleOpenMaterial() {
      this.isShowSel = true
      this.$nextTick(() => {
        this.$refs.AssetSelRef.isShowModal = true
      })
    },
    close() {
      this.isShowModal = false
      this.$emit('close')
    },
    getDetail(id) {
      getInfoById(id).then(res => {
        this.param = res
      })
    },
  }
}
</script>
<style lang="scss" scoped>
.df_ac {
  display: flex;
  align-items: center;
  flex-wrap: wrap;

  .w3 {
    width: 33.3%;
    padding: 0 10px;
    box-sizing: border-box;
  }

  .w6 {
    width: 66.6%;
    padding: 0 10px;
    box-sizing: border-box;
  }
}
</style>

 admin/src/views/stock/components/inventoryDetails.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,183 @@
<template>
    <GlobalWindow
        :title="title"
        :visible.sync="visible"
        :withFooter="false"
        :confirm-working="isWorking"
        @confirm="confirm">
        <div class="main">
            <div class="title">盘点信息</div>
            <div class="list">
                <div class="item">
                    <div class="la">盘点单名称</div>
                    <div class="val">库存盘点20241212</div>
                </div>
                <div class="item">
                    <div class="la">盘点日期</div>
                    <div class="val">2024-11-17</div>
                </div>
                <div class="item">
                    <div class="la">盘点仓库</div>
                    <div class="val">仓库1</div>
                </div>
                <div class="item">
                    <div class="la">盘点员</div>
                    <div class="val">张三</div>
                </div>
                <div class="item">
                    <div class="la">盘点状态</div>
                    <div class="val">已完成</div>
                </div>
            </div>
            <div class="title">盘点结果</div>
            <div class="list">
                <div class="list_search">
                    <div class="list_search_left">
                        <el-input v-model="input" style="width: 200px; margin-right: 10px;" placeholder="请输入内容"></el-input>
                        <el-select v-model="input" style="width: 200px; margin-right: 10px;" placeholder="请选择">
                            <el-option
                                v-for="item in options"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                            </el-option>
                        </el-select>
                        <el-button type="primary">查询</el-button>
                        <el-button>清空</el-button>
                        <el-button>导出</el-button>
                    </div>
                    <div class="list_search_right">
                        <span>已盘:100</span>
                        <span>未盘:20</span>
                        <span>账实相符:88</span>
                        <span>盘盈:2</span>
                        <span>盘亏:20</span>
                    </div>
                </div>
                <div style="width: 100%; margin: 20px 0;">
                    <el-table :data="roomList" stripe>
                        <el-table-column prop="projectName" label="资产编码" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="资产名称" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="条码" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="品牌" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="规格型号" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="单位" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="所在仓库" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="账面数量" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="盘点数量" show-overflow-tooltip />
                        <el-table-column prop="buildingName" label="备注" show-overflow-tooltip />
                    </el-table>
                </div>
                <div class="list_pagination">
                    <el-pagination
                        @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page="page"
                        :page-sizes="[10, 20, 30, 40]"
                        :page-size="pageSize"
                        layout="total, sizes, prev, pager, next, jumper"
                        :total="total">
                    </el-pagination>
                </div>
            </div>
        </div>
    </GlobalWindow>
</template>

<script>
  import GlobalWindow from '@/components/common/GlobalWindow'
  import BaseOpera from '@/components/base/BaseOpera'
  export default {
    name: "inventoryDetails",
    components: {
      GlobalWindow
    },
    extends: BaseOpera,
    data() {
      return {
        info: {},
        input: '',
        options: [],
        roomList: [],

        pageSize: 10,
        total: 0,
        page: 1
      }
    },
    methods: {
      handleSizeChange(size) {
        this.pageSize = size
      },
      handleCurrentChange(page) {
        this.page = page
      },
      open (title) {
        this.title = title
        this.visible = true
      }
    }
  }
</script>

<style lang="scss" scoped>
    @import '@/assets/style/variables.scss';
    
    .main {
        .title {
            font-weight: 500;
            font-size: 18px;
            padding-top: 20px;
            box-sizing: border-box;
            color: $primary-color;
            margin-bottom: 15px;
        }
        
        .list {
            display: flex;
            flex-wrap: wrap;
            /*background: #F7F7F7;*/
            border-radius: 2px;
            /*padding: 15px 20px;*/
            margin-bottom: 20px;
            
            .list_pagination {
                width: 100%;
                text-align: right;
            }
            
            .list_search {
                width: 100%;
                display: flex;
                align-items: center;
                justify-content: space-between;
                .list_search_left {
                    display: flex;
                    align-items: center;
                }
                .list_search_right {
                    display: flex;
                    align-items: center;
                    span {
                        color: #7E7E7E;
                        font-size: 14px;
                        margin-right: 15px;
                        &:last-child {
                            margin: 0 !important;
                        }
                    }
                }
            }
            
            .item {
                width: 20%;
                margin-bottom: 16px;
                
                .la {
                    color: #7f7f7f;
                    margin-bottom: 10px;
                }
            }
        }
    }
</style>

 admin/src/views/stock/components/newAsset.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
<template>
    <GlobalWindow
        width="50%"
        :title="title"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm">
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="分类名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入分类名称" v-trim />
            </el-form-item>
            <el-form-item label="所属分类" prop="name">
                <el-select v-model="form.name" placeholder="请选择">
                    <el-option label="张三" :value="1"></el-option>
                    <el-option label="李四" :value="1"></el-option>
                    <el-option label="王二" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="排序码(升序)" prop="name">
                <el-input v-model="form.name" placeholder="请输入排序码" v-trim />
            </el-form-item>
        </el-form>
    </GlobalWindow>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  export default {
    name: 'newAsset',
    extends: BaseOpera,
    components: { GlobalWindow },
    data() {
      return {
        // è¡¨å•æ•°æ®
        form: {
          id: '',
          name: '',
        },
        // éªŒè¯è§„则
        rules: {
          name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
        },
      }
    },
    created() {
      this.config({
        api: '/project/ywProject',
        'field.id': 'id'
      })
    },
    methods: {

    }
  }
</script>

 admin/src/views/stock/components/newInventory.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
<template>
    <GlobalWindow
        width="50%"
        :title="title"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm">
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="盘点单名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入盘点单名称" v-trim />
            </el-form-item>
            <el-form-item label="盘点日期" prop="name">
                <el-date-picker
                    v-model="form.name"
                    type="date"
                    placeholder="选择日期">
                </el-date-picker>
            </el-form-item>
            <el-form-item label="盘点仓库" prop="name">
                <el-select v-model="form.name" placeholder="请选择">
                    <el-option label="张三" :value="1"></el-option>
                    <el-option label="李四" :value="1"></el-option>
                    <el-option label="王二" :value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="盘点员" prop="name">
                <el-select v-model="form.name" placeholder="请选择">
                    <el-option label="张三" :value="1"></el-option>
                    <el-option label="李四" :value="1"></el-option>
                    <el-option label="王二" :value="1"></el-option>
                </el-select>
            </el-form-item>
        </el-form>
    </GlobalWindow>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  export default {
    name: 'newInventory',
    extends: BaseOpera,
    components: { GlobalWindow },
    data() {
      return {
        // è¡¨å•æ•°æ®
        form: {
          id: '',
          name: '',
        },
        // éªŒè¯è§„则
        rules: {
          name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
        },
      }
    },
    created() {
      this.config({
        api: '/project/ywProject',
        'field.id': 'id'
      })
    },
    methods: {
    
    }
  }
</script>

 admin/src/views/stock/in.vue

@@ -2,7 +2,8 @@
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
    <div class="mt20">
      <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">导出</el-button>
      <el-button type="primary" @click="handleEdit()" v-permissions="['business:ywpatrolline:create']">新建出库单</el-button>
      <el-button @click="handleEx()" v-permissions="['business:ywpatrolline:create']">导出</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="platformName" label="出库单号" min-width="120" show-overflow-tooltip />
@@ -13,20 +14,25 @@
      <el-table-column prop="param2" label="操作人" min-width="90" show-overflow-tooltip />
      <el-table-column prop="workTime" label="操作时间" min-width="140" show-overflow-tooltip />
      <el-table-column prop="workTime" label="操作" min-width="80" show-overflow-tooltip>
        <template v-slot="{row}">
          <span class="primaryColor pointer">查看详情</span>
        <template v-slot="{ row }">
          <span @click="handleDetail(row)" class="primaryColor pointer">查看详情</span>
        </template>
      </el-table-column>
    </el-table>
    <div class="mt20">
      <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
    </div>
    <!--  -->
    <InEdit v-if="isShowEdit" @close="isShowEdit = false" @success="getList" ref="InEditRef" />
    <InDetail v-if="isShowDetail" ref="InDetailRef" />
  </div>
</template>

<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import InEdit from './components/InEdit'
import InDetail from './components/InDetail'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
@@ -34,22 +40,26 @@
export default {
  components: {
    Pagination,
    QueryForm
    QueryForm,
    InEdit,
    InDetail
  },
  data() {
    return {
      loading: false,
      isShowEdit: false,
      isShowDetail: false,
      pagination: {
        pageSize: 10,
        page: 1,
        total: 0
      },
      filters: {},
      list: [],
      list: [{}],
      total: 0,
      queryFormConfig: {
        formItems: [
        {
          {
            filed: 'carCodeFront',
            type: 'input',
            label: '出库单号',
@@ -82,6 +92,18 @@
        }
      })
    },
    handleEdit() {
      this.isShowEdit = true
      this.$nextTick(() => {
        this.$refs.InEditRef.isShowModal = true
      })
    },
    handleDetail() {
      this.isShowDetail = true
      this.$nextTick(() => {
        this.$refs.InDetailRef.visible = true
      })
    },
    handleEx() { },
    getGroupList() {
      getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
@@ -97,6 +119,7 @@
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      if(page){pagination.page = page}
      platformLogPage({
        model: {
          ...filters,
@@ -106,7 +129,7 @@
        },
        sorts: [{ direction: 'DESC', property: 'param1' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
        page: page,
      }).then(res => {
        this.loading = false
        this.list = res.records || []
@@ -128,11 +151,10 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}
</script>

<style>

</style>
<style></style>

 admin/src/views/stock/inventoryCount.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
<template>
    <TableLayout :permissions="['business:ywroom:query']">
        <!-- æœç´¢è¡¨å• -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
            <el-form-item label="盘点单名称" prop="roomNum">
                <el-input v-model="searchForm.roomNum" placeholder="请输入盘点单名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="状态" prop="buildingId">
                <el-select v-model="searchForm.buildingId" placeholder="请选择楼宇" clearable>
                    <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                </el-select>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <ul class="toolbar">
                <li><el-button type="primary" @click="$refs.newInventory.open('新建盘点单')">添加</el-button></li>
                <li><el-button type="primary" @click="$refs.inventoryDetails.open('盘点详细')">详情</el-button></li>
            </ul>
            <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
                <el-table-column prop="projectName" label="盘点单名称" min-width="100px"></el-table-column>
                <el-table-column prop="buildingName" label="盘点仓库" min-width="70px"></el-table-column>
                <el-table-column prop="floorName" label="盘点员" min-width="60px"></el-table-column>
                <el-table-column prop="roomNum" label="盘点日期" min-width="60px"></el-table-column>
                <el-table-column prop="rentArea" label="创建人" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="创建时间" min-width="80px"></el-table-column>
                <el-table-column prop="feeArea" label="盘点状态" min-width="80px"></el-table-column>
                <el-table-column label="操作">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.inventoryDetails.open('盘点详细')">查看详情</el-button>
                        <el-button type="text">取消</el-button>
                        <el-button type="text">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
            <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
            </pagination>
            <newInventory ref="newInventory" />
            <inventoryDetails ref="inventoryDetails" />
        </template>
    </TableLayout>
</template>

<script>
  import BaseTable from '@/components/base/BaseTable'
  import TableLayout from '@/layouts/TableLayout'
  import Pagination from '@/components/common/Pagination'
  import newInventory from './components/newInventory'
  import inventoryDetails from './components/inventoryDetails'
  export default {
    name: 'inventoryCount',
    extends: BaseTable,
    components: { TableLayout, Pagination, newInventory, inventoryDetails },
    data() {
      return {
        // æœç´¢
        searchForm: {
          id: '',
          creator: '',
          createDate: '',
          editor: '',
          editDate: '',
          isdeleted: '',
          name: '',
          remark: '',
          status: '',
          sortnum: '',
          imgurl: '',
          code: '',
          roomNum: '',
          isInvestment: '',
          area: '',
          feeArea: '',
          rentArea: '',
          floor: '',
          projectId: '',
          buildingId: ''
        },
        projectList: [],
        buildList: [],

        filters: {}
      }
    },
    created() {
      this.config({
        module: '运维房源信息表',
        api: '/project/ywRoom',
        'field.id': 'id',
        'field.main': 'id'
      })
    },
    methods: {

    }
  }
</script>

 admin/src/views/stock/out.vue

@@ -2,7 +2,8 @@
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
    <div class="mt20">
      <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">导出</el-button>
      <el-button type="primary" @click="handleEdit()" v-permissions="['business:ywpatrolline:create']">新建出库单</el-button>
      <el-button @click="handleEx()" v-permissions="['business:ywpatrolline:create']">导出</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="platformName" label="出库单号" min-width="120" show-overflow-tooltip />
@@ -13,20 +14,25 @@
      <el-table-column prop="param2" label="操作人" min-width="90" show-overflow-tooltip />
      <el-table-column prop="workTime" label="操作时间" min-width="140" show-overflow-tooltip />
      <el-table-column prop="workTime" label="操作" min-width="80" show-overflow-tooltip>
        <template v-slot="{row}">
          <span class="primaryColor pointer">查看详情</span>
        <template v-slot="{ row }">
          <span @click="handleDetail(row)" class="primaryColor pointer">查看详情</span>
        </template>
      </el-table-column>
    </el-table>
    <div class="mt20">
      <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
    </div>
    <!--  -->
    <OutEdit v-if="isShowEdit" @close="isShowEdit = false" @success="getList" ref="OutEditRef" />
    <OutDetail v-if="isShowDetail" ref="OutDetailRef" />
  </div>
</template>

<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import OutEdit from './components/OutEdit'
import OutDetail from './components/OutDetail'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
@@ -34,22 +40,26 @@
export default {
  components: {
    Pagination,
    QueryForm
    QueryForm,
    OutEdit,
    OutDetail
  },
  data() {
    return {
      loading: false,
      isShowEdit: false,
      isShowDetail: false,
      pagination: {
        pageSize: 10,
        page: 1,
        total: 0
      },
      filters: {},
      list: [],
      list: [{}],
      total: 0,
      queryFormConfig: {
        formItems: [
        {
          {
            filed: 'carCodeFront',
            type: 'input',
            label: '出库单号',
@@ -82,6 +92,18 @@
        }
      })
    },
    handleEdit() {
      this.isShowEdit = true
      this.$nextTick(() => {
        this.$refs.OutEditRef.isShowModal = true
      })
    },
    handleDetail() {
      this.isShowDetail = true
      this.$nextTick(() => {
        this.$refs.OutDetailRef.visible = true
      })
    },
    handleEx() { },
    getGroupList() {
      getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
@@ -97,6 +119,7 @@
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      if(page){pagination.page = page}
      platformLogPage({
        model: {
          ...filters,
@@ -106,7 +129,7 @@
        },
        sorts: [{ direction: 'DESC', property: 'param1' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
        page: page,
      }).then(res => {
        this.loading = false
        this.list = res.records || []
@@ -128,11 +151,10 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}
</script>

<style>

</style>
<style></style>

 admin/src/views/stock/query.vue

@@ -124,6 +124,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/stock/record.vue

@@ -142,6 +142,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/system/publicMsg.vue

@@ -145,6 +145,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}

 admin/src/views/system/smsMessage.vue

@@ -3,8 +3,7 @@
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
    </QueryForm>
    <div class="pt16 mb10">
      <el-button type="primary" @click="batchStatus(0)"
        v-permissions="['business:platformjob:update']">批量启用</el-button>
      <el-button type="primary" @click="batchStatus(0)" v-permissions="['business:platformjob:update']">批量启用</el-button>
      <el-button @click="batchStatus(1)" v-permissions="['business:platformjob:update']">批量禁用</el-button>
    </div>
    <el-table @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
@@ -15,7 +14,8 @@
      <el-table-column prop="content" label="消息模板" min-width="300" show-overflow-tooltip />
      <el-table-column label="状态" width="120" align="center" fixed="right">
        <template v-slot="scope">
          <el-switch v-permissions="['business:platformjob:update']" v-model="scope.row.status" @change="changeStatus(scope.row)" :active-value="0" :inactive-value="1">
          <el-switch v-permissions="['business:platformjob:update']" v-model="scope.row.status"
            @change="changeStatus(scope.row)" :active-value="0" :inactive-value="1">
          </el-switch>
        </template>
      </el-table-column>
@@ -145,6 +145,7 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()
    }
  }
}