供应，分公司

2025-11-20 14:36:28 +08:00 · 2025-11-20 14:36:28 +08:00 · d8b0c68bd7
parent fa67295241
commit d8b0c68bd7
18 changed files with 124 additions and 23 deletions
--- a/src/views/business-examine/receive-apply/index.vue
+++ b/src/views/business-examine/receive-apply/index.vue
@ -136,10 +136,11 @@ export default {
                { label: '已完成', value: '2' },
                { label: '已驳回', value: '3' }
            ],
-            // 表头
+            // 表头 
            tableColumns: [
                { label: '申请时间', prop: 'createTime', width: '100',  showTooltip: false },
                { label: '申请人', prop: 'createBy' },
+                { label: '分公司', prop: 'impUnitName', showTooltip: false },
                { label: '领用单位', prop: 'leaseUnit', showTooltip: false },
                { label: '领用工程', prop: 'leaseProject', showTooltip: false },
                { label: '领料物资类型', prop: 'maTypeNames' },
--- a/src/views/business/businessHandlingRecord/index.vue
+++ b/src/views/business/businessHandlingRecord/index.vue
@ -324,6 +324,7 @@ export default {
      tableColumns: [
        { label: '申请时间', prop: 'createTime', width: '100' },
        { label: '申请人', prop: 'createBy', width: '80' },
+        { label: '分公司', prop: 'impUnitName', showTooltip: false },
        { label: '领用单位', prop: 'leaseUnit', width: '180' },
        { label: '领用工程', prop: 'leaseProject', width: '180' },
        { label: '领料物资类型', prop: 'maTypeNames', showTooltip: true },
--- a/src/views/material/cost/component/applyHome.vue
+++ b/src/views/material/cost/component/applyHome.vue
@ -72,6 +72,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" />
            <el-table-column label="结算工程" align="center" prop="projectName" />
            <el-table-column label="合计费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
--- a/src/views/material/cost/component/examHome.vue
+++ b/src/views/material/cost/component/examHome.vue
@ -53,6 +53,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" />
            <el-table-column label="结算工程" align="center" prop="projectName" />
            <el-table-column label="合计费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
--- a/src/views/material/cost/component/leaseCostRangeReportHome.vue
+++ b/src/views/material/cost/component/leaseCostRangeReportHome.vue
@ -43,6 +43,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="180"/>
            <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true" width="200"/>
            <el-table-column label="结算状态" align="center" prop="isSettled" width="90">
--- a/src/views/material/cost/component/lostReportHome.vue
+++ b/src/views/material/cost/component/lostReportHome.vue
@ -57,6 +57,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" />
            <el-table-column label="结算工程" align="center" prop="projectName" />
            <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
--- a/src/views/material/cost/component/repairReportHome.vue
+++ b/src/views/material/cost/component/repairReportHome.vue
@ -57,6 +57,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" />
            <el-table-column label="结算工程" align="center" prop="projectName" />
            <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
--- a/src/views/material/cost/component/reportHome.vue
+++ b/src/views/material/cost/component/reportHome.vue
@ -57,6 +57,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" />
            <el-table-column label="结算工程" align="center" prop="projectName" />
            <el-table-column label="结算时间" align="center" prop="createTime" width="100" />
--- a/src/views/material/cost/component/scrapReportHome.vue
+++ b/src/views/material/cost/component/scrapReportHome.vue
@ -57,6 +57,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" />
            <el-table-column label="结算工程" align="center" prop="projectName" />
            <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
--- a/src/views/material/cost/component/unreportHome.vue
+++ b/src/views/material/cost/component/unreportHome.vue
@ -22,6 +22,17 @@
            <el-form-item prop="agreementCode">
                <el-input v-model="queryParams.agreementCode" placeholder="请输入协议号" clearable/>
            </el-form-item>
+            <el-form-item prop="isFinish">
+                <el-select v-model="queryParams.isFinish" placeholder="请选择竣工状态" clearable filterable>
+                    <el-option
+                        v-for="item in proStatus"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+
+            </el-form-item>
            <el-form-item>
                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" >查询</el-button>
                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" >重置</el-button>
@ -44,6 +55,7 @@
                </template>
            </el-table-column>
            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
+            <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
            <el-table-column label="结算单位" align="center" prop="unitName" />
            <el-table-column label="结算工程" align="center" prop="projectName" />

@ -126,7 +138,12 @@
                </span>
              </template>
            </el-table-column>
-
+            <el-table-column label="竣工状态" align="center" prop="isFinish" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.isFinish == 1" effect="plain">已竣工</el-tag>
+                    <el-tag type="warning" v-if="scope.row.isFinish == 0" effect="plain">未竣工</el-tag>
+                </template>
+            </el-table-column>
        </el-table>

       <pagination
@ -600,6 +617,7 @@ export default {
                projectId: null,
                agreementId: null,
                agreementCode: null,
+                isFinish: null,
            },
            openPrint: false,
            // 审批弹窗
@ -643,6 +661,10 @@ export default {
            historyCostDetailList: [],
            historyCostDetailType: '', // 当前查看的历史费用类型
            currentHistoryRow: {}, // 当前选中的历史报表行
+            proStatus:[
+                { id: 0, name: '未竣工' },
+                { id: 1, name: '已竣工' },
+            ]
        }
    },
    created() {
@ -751,6 +773,7 @@ export default {
                projectId: null,
                agreementId: '',
                agreementCode: '',
+                isFinish: null,
            }
            this.resetForm('queryForm')
            this.handleQuery()
--- a/src/views/material/costPush/expendableExpensePush/index.vue
+++ b/src/views/material/costPush/expendableExpensePush/index.vue
@ -193,6 +193,7 @@ export default {
      // 表头
      tableColumns: [
        { label: '协议编号', prop: 'agreementCode' },
+        { label: '分公司', prop: 'impUnitName' },
        { label: '单位名称', prop: 'unitName' },
        { label: '工程名称', prop: 'projectName' },
        { label: '推送月份', prop: 'month' },
--- a/src/views/material/costPush/leaseExpensePush/index.vue
+++ b/src/views/material/costPush/leaseExpensePush/index.vue
@ -223,6 +223,7 @@ export default {
      // 表头
      tableColumns: [
        { label: '协议编号', prop: 'agreementCode' },
+        { label: '分公司', prop: 'impUnitName' },
        { label: '单位名称', prop: 'unitName' },
        { label: '工程名称', prop: 'projectName' },
        { label: '推送月份', prop: 'month' },
--- a/src/views/material/costPush/protocolMatch/index.vue
+++ b/src/views/material/costPush/protocolMatch/index.vue
@ -76,6 +76,7 @@
        </template>
      </el-table-column>
      <el-table-column label="协议号" align="center" prop="agreementCode" sortable show-overflow-tooltip />
+      <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
      <el-table-column label="单位名称" align="center" prop="unitName" />
      <el-table-column label="工程名称" align="center" prop="projectName" />
      <el-table-column label="工程ID" align="center" prop="projectId" sortable show-overflow-tooltip />
--- a/src/views/material/costPush/pushReview/index.vue
+++ b/src/views/material/costPush/pushReview/index.vue
@ -111,6 +111,7 @@
        </template>
      </el-table-column>
      <el-table-column label="协议号" align="center" prop="agreementCode"  show-overflow-tooltip width="120px"/>
+      <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
      <el-table-column label="单位名称" align="center" prop="unitName" width="180" />
      <el-table-column label="工程名称" align="center" prop="projectName" width="180" />
      <el-table-column label="推送月份" align="center" prop="month" width="100" >
--- a/src/views/material/repair/partUsing/index.vue
+++ b/src/views/material/repair/partUsing/index.vue
@ -46,6 +46,16 @@
            style="width: 240px"
          />
        </el-form-item>
+        <el-form-item prop="impUnitName">
+            <el-select v-model="queryParams.impUnitName" placeholder="请选择分公司" clearable style="width: 240px">
+                <el-option
+                    v-for="item in impUnitNameList"
+                    :key="item.impUnitName"
+                    :label="item.impUnitName"
+                    :value="item.impUnitName"
+                ></el-option>
+            </el-select>
+        </el-form-item>
        <el-form-item>
            <el-button
                type="primary"
@ -77,6 +87,7 @@
                    <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
                </template>
          </el-table-column>
+          <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
          <el-table-column label="退料单位" align="center" prop="unitName" width="180px"/>
          <el-table-column label="退料工程" align="center" prop="projectName" width="220px"/>
          <el-table-column label="维修单号" align="center" prop="code" width="150px" :show-overflow-tooltip="true"/>
@ -126,6 +137,7 @@ import {
 import {
    getProjectList,
    getUnitList,
+    getImpUnitNameListApi,
 } from '@/api/back/index.js'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -174,7 +186,9 @@ export default {
                statusName: null, //状态
                startTime: null,
                endTime: null,
+                impUnitName: null, //分公司
            },
+            impUnitNameList: [],
        }
    },
    computed: {
@ -198,6 +212,7 @@ export default {
        this.queryParams.startTime = this.format(start)
        this.queryParams.endTime = this.format(end)
        this.initSelectData()
+        this.getImpUnitNameList()
        this.getList()
    },
    methods: {
@ -233,6 +248,17 @@ export default {
                children: node.children,
            };
        },
+
+      // 分公司下拉
+      async getImpUnitNameList () {
+          try {
+              const res = await getImpUnitNameListApi()
+              this.impUnitNameList = res.data
+          } catch (error) {
+              console.log('🚀 ~ error:', error)
+          }
+      }, 
+
      // 获取 来往单位 列表数据
      async GetUnitData() {
              const params = {
@ -269,6 +295,7 @@ export default {
                  keyWord: this.queryParams.keyWord,
                  typeName: this.queryParams.typeName,
                  statusName: this.queryParams.statusName,
+                  impUnitName: this.queryParams.impUnitName,
                  startTime: this.queryParams.startTime,
                  endTime: this.queryParams.endTime,
                  pageSize: this.queryParams.pageSize,
--- a/src/views/material/repair/projectRepairing/index.vue
+++ b/src/views/material/repair/projectRepairing/index.vue
@ -28,6 +28,16 @@
            style="width: 240px"
          />
        </el-form-item>
+        <el-form-item prop="impUnitName">
+            <el-select v-model="queryParams.impUnitName" placeholder="请选择分公司" clearable style="width: 240px">
+                <el-option
+                    v-for="item in impUnitNameList"
+                    :key="item.impUnitName"
+                    :label="item.impUnitName"
+                    :value="item.impUnitName"
+                ></el-option>
+            </el-select>
+        </el-form-item>
        <el-form-item>
            <el-button
                type="primary"
@ -61,6 +71,7 @@
          </el-table-column>
          <el-table-column label="维修时间" align="center" prop="repairTime" width="180px":show-overflow-tooltip="true"/>
          <el-table-column label="维修单号" align="center" prop="repairCode"  :show-overflow-tooltip="true"/>
+          <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
          <el-table-column label="退料单位" align="center" prop="backUnitName" width="180px" :show-overflow-tooltip="true"/>
          <el-table-column label="退料工程" align="center" prop="backProjectName" width="220px"/>
          <el-table-column label="机具类型" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
@ -85,7 +96,9 @@
 import {
  getRepairProjectListApi,
 } from '@/api/repair/repair';
-
+import {
+    getImpUnitNameListApi,
+} from '@/api/back/index.js'

 export default {
    name: 'ProjectRepairing',
@ -115,7 +128,9 @@ export default {
                keyWord: null,
                startTime: null,
                endTime: null,
+                impUnitName: null,
            },
+            impUnitNameList: [],
        }
    },
    computed: {
@ -138,6 +153,7 @@ export default {
        start.setMonth(start.getMonth() - 1)
        this.queryParams.startTime = this.format(start)
        this.queryParams.endTime = this.format(end)
+        this.getImpUnitNameList()
        this.getList()
    },
    methods: {
@ -158,12 +174,23 @@ export default {
        return `${year}-${month}-${day}`;
      },

+       // 分公司下拉
+      async getImpUnitNameList () {
+          try {
+              const res = await getImpUnitNameListApi()
+              this.impUnitNameList = res.data
+          } catch (error) {
+              console.log('🚀 ~ error:', error)
+          }
+      }, 
+
      // 获取列表
      async getList() {
        try {
            this.loading = true
            const params = {
                  keyWord: this.queryParams.keyWord,
+                  impUnitName: this.queryParams.impUnitName,
                  startTime: this.queryParams.startTime,
                  endTime: this.queryParams.endTime,
                  pageSize: this.queryParams.pageSize,
--- a/src/views/material/repair/testRecord/index.vue
+++ b/src/views/material/repair/testRecord/index.vue
@ -54,6 +54,18 @@
                style="width: 240px"
            />
        </el-form-item>
+        <el-form-item prop="impUnitName">
+            <el-select v-model="queryParams.impUnitName" placeholder="请选择分公司" clearable style="width: 240px">
+                <el-option
+                    v-for="item in impUnitNameList"
+                    :key="item.impUnitName"
+                    :label="item.impUnitName"
+                    :value="item.impUnitName"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+
+
        <el-form-item>
            <el-button
                type="primary"
@ -85,6 +97,7 @@
                    <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
                </template>
          </el-table-column>
+          <el-table-column label="分公司" align="center" prop="impUnitName" width="150px":show-overflow-tooltip="true"/>
          <el-table-column label="退料单位" align="center" prop="backUnitName" />
          <el-table-column label="退料工程" align="center" prop="projectName" />
          <el-table-column label="维修单号" align="center" prop="repairCode"  :show-overflow-tooltip="true"/>
@ -263,6 +276,7 @@ import {
 import {
    getProjectList,
    getUnitList,
+    getImpUnitNameListApi,
 } from '@/api/back/index.js'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -312,6 +326,7 @@ export default {
                statusName: null, //状态
                startTime: null,
                endTime: null,
+                impUnitName: null, //分公司
            },
            dialogVisible: false, // 弹框显示
            printTableData: [], 
@ -322,6 +337,7 @@ export default {
            testResult2: '',
            testResult3: '',
            testConclusion: '合格',
+            impUnitNameList: [],
        }
    },
    computed: {
@ -346,6 +362,7 @@ export default {
        this.queryParams.startTime = this.format(start)
        this.queryParams.endTime = this.format(end)
        this.initSelectData()
+        this.getImpUnitNameList()
        this.getList()
    },
    methods: {
@ -381,6 +398,16 @@ export default {
                children: node.children,
            };
        },
+
+      // 分公司下拉
+      async getImpUnitNameList () {
+          try {
+              const res = await getImpUnitNameListApi()
+              this.impUnitNameList = res.data
+          } catch (error) {
+              console.log('🚀 ~ error:', error)
+          }
+      },       
      // 获取 来往单位 列表数据
      async GetUnitData() {
              const params = {
@ -429,6 +456,7 @@ export default {
                  keyWord: this.queryParams.keyWord,
                  typeName: this.queryParams.typeName,
                  statusName: this.queryParams.statusName,
+                  impUnitName: this.queryParams.impUnitName,
                  startTime: this.queryParams.startTime,
                  endTime: this.queryParams.endTime,
                  pageSize: this.queryParams.pageSize,
--- a/src/views/material/stquery/deviceComparisonStatistical.vue
+++ b/src/views/material/stquery/deviceComparisonStatistical.vue
@ -72,29 +72,12 @@
        type="index"
        :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
      />
+      <el-table-column label="分公司" align="center" prop="impUnitName" min-width="160"/>
      <el-table-column label="工程名称" align="center" prop="proName" min-width="160"/>
-      <el-table-column label="物资名称" align="center" prop="typeName" />
-      <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-      <el-table-column label="计量单位" align="center" prop="unit" :show-overflow-tooltip="true" />
+      <el-table-column label="机具类型" align="center" prop="jijuType" />
      <el-table-column label="需求数量" align="center" prop="needNum" :show-overflow-tooltip="true" />
      <el-table-column label="已供数量（累计）" align="center" prop="supplyNum" :show-overflow-tooltip="true" />
-      <el-table-column label="差值（需求F-已供G）" align="center" prop="diffNum" :show-overflow-tooltip="true" />
-      <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true" />
-      <el-table-column label="库存数量" align="center" prop="storeNum" :show-overflow-tooltip="true" />
-      <el-table-column label="在修数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
-      <el-table-column label="待入库数量" align="center" prop="inputNum" :show-overflow-tooltip="true" />
-      <el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true" />
-      <el-table-column label="总在用工程明细" align="center" prop="allUsNum" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span v-if="scope.row.allUsNum > 0" class="clickText" @click="openUserRecords(scope.row)">
-            {{ scope.row.allUsNum }}
-          </span>
-          <!-- 否则，直接显示数字 -->
-          <span v-else>
-            {{ scope.row.allUsNum }}
-          </span>
-        </template>
-      </el-table-column>
+      <el-table-column label="差值（已供G-需求F）" align="center" prop="diffNum" :show-overflow-tooltip="true" />
    </el-table>
    <pagination
      v-show="total > 0"