Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

yuan

2026-08-26 b21afc26b596a5a7cb77b36cd96f6e0df91637eb

Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

 src/views/basicData/customerFile/index.vue

@@ -738,16 +738,16 @@
      prop: "contactPhone",
      width: 150,
    },
    {
      label: "跟进进度",
      prop: "followUpLevel",
      width: 120,
    },
    {
      label: "跟进时间",
      prop: "followUpTime",
      width: 120,
    },
    // {
    //   label: "跟进进度",
    //   prop: "followUpLevel",
    //   width: 120,
    // },
    // {
    //   label: "跟进时间",
    //   prop: "followUpTime",
    //   width: 120,
    // },
    {
      label: "银行基本户",
      prop: "basicBankAccount",
@@ -795,7 +795,7 @@
      label: "操作",
      align: "center",
      fixed: "right",
      width: 290,
      width: 130,
      operation: [
        {
          name: "编辑",
@@ -804,20 +804,20 @@
            openForm("edit", row);
          },
        },
                {
                    name: "添加洽谈进度",
                    type: "text",
                    clickFun: row => {
                        openNegotiationDialog(row);
                    },
                },
        {
          name: "回访提醒",
          type: "text",
          clickFun: row => {
            openReminderDialog(row);
          },
        },
                // {
                //     name: "添加洽谈进度",
                //     type: "text",
                //     clickFun: row => {
                //         openNegotiationDialog(row);
                //     },
                // },
        // {
        //   name: "回访提醒",
        //   type: "text",
        //   clickFun: row => {
        //     openReminderDialog(row);
        //   },
        // },
                {
                    name: "详情",
                    type: "text",

 src/views/collaborativeApproval/knowledgeBase/index.vue

@@ -282,14 +282,14 @@
        <el-table :data="fileList" style="margin-top: 20px" border>
          <el-table-column prop="fileName" label="文件名" show-overflow-tooltip />
          <el-table-column prop="fileType" label="文件类型" width="100" />
          <el-table-column label="向量化状态" width="120">
            <template #default="{ row }">
              <el-tag :type="getStatusType(row.vectorStatus)">
                {{ getStatusText(row.vectorStatus) }}
              </el-tag>
            </template>
          </el-table-column>
          <el-table-column prop="chunkCount" label="切片数" width="100" align="center" />
<!--          <el-table-column label="向量化状态" width="120">-->
<!--            <template #default="{ row }">-->
<!--              <el-tag :type="getStatusType(row.vectorStatus)">-->
<!--                {{ getStatusText(row.vectorStatus) }}-->
<!--              </el-tag>-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--          <el-table-column prop="chunkCount" label="切片数" width="100" align="center" />-->
          <el-table-column label="错误信息" width="200" show-overflow-tooltip>
            <template #default="{ row }">
              <span v-if="row.vectorError" style="color: #f56c6c">{{ row.vectorError }}</span>

 src/views/collaborativeApproval/rulesRegulationsManagement/index.vue

@@ -169,7 +169,13 @@
                         width="100" />
        <el-table-column prop="updateTime"
                         label="更新时间"
                         width="180" />
                         width="180" >
          <template #default="scope">
            <el-text>
              {{scope.row.updateTime?dayjs(scope.row.updateTime).format("YYYY-MM-DD"):"--"}}
            </el-text>
          </template>
        </el-table-column>
        <el-table-column prop="createUserName"
                         label="更新人"
                         width="120" />
@@ -228,6 +234,7 @@
    addReadingStatus,
    updateReadingStatus,
  } from "@/api/collaborativeApproval/sealManagement.js";
  import dayjs from "dayjs";
  const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
  import {
    listRuleFiles,
@@ -455,7 +462,7 @@
  const viewVersionHistory = row => {
    showVersionHistoryDialog.value = true;
    const params = {
      category: row.category,
      title: row.title,
    };
    listRuleManagement(page, params).then(res => {
      if (res.code == 200) {

 src/views/equipmentManagement/measurementEquipment/index.vue

@@ -114,12 +114,12 @@
      width: 200,
      align: "center",
    },
    {
      label: "证书编号",
      prop: "model",
      width: 200,
      align: "center",
    },
    // {
    //   label: "证书编号",
    //   prop: "model",
    //   width: 200,
    //   align: "center",
    // },
    {
      label: "最新鉴定日期",
      prop: "mostDate",

 src/views/equipmentManagement/upkeep/index.vue

@@ -172,7 +172,7 @@
                  <el-table-column label="实际保养人" prop="maintenanceActuallyName" align="center" />
                  <el-table-column label="实际保养日期" align="center">
                    <template #default="{ row }">
                      {{ row.maintenanceActuallyTime ? dayjs(row.maintenanceActuallyTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
                      {{ row.maintenanceActuallyTime ? dayjs(row.maintenanceActuallyTime).format('YYYY-MM-DD') : '-' }}
                    </template>
                  </el-table-column>
                  <el-table-column label="保养结果" align="center">

 src/views/monitor/logininfor/index.vue

@@ -95,7 +95,11 @@


      <el-table ref="logininforRef" v-loading="loading" :data="logininforList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">

         <el-table-column type="selection" width="55" align="center" />

         <el-table-column label="访问编号" align="center" prop="infoId" />

         <el-table-column label="访问编号" align="center">

            <template #default="scope">

               <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>

            </template>

         </el-table-column>

         <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />

         <el-table-column label="地址" align="center" prop="ipaddr" :show-overflow-tooltip="true" />

         <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />


 src/views/monitor/operlog/index.vue

@@ -61,7 +61,7 @@
         <el-form-item label="操作时间" style="width: 308px">

            <el-date-picker

               v-model="dateRange"

               value-format="YYYY-MM-DD HH:mm:ss"

               value-format="YYYY-MM-DD"

               type="daterange"

               range-separator="-"

               start-placeholder="开始日期"

@@ -109,7 +109,11 @@


      <el-table ref="operlogRef" v-loading="loading" :data="operlogList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">

         <el-table-column type="selection" width="50" align="center" />

         <el-table-column label="日志编号" align="center" prop="operId" />

         <el-table-column label="日志编号" align="center">

            <template #default="scope">

               <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>

            </template>

         </el-table-column>

         <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />

         <el-table-column label="操作类型" align="center" prop="businessType">

            <template #default="scope">

@@ -125,7 +129,7 @@
         </el-table-column>

         <el-table-column label="操作日期" align="center" prop="operTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">

            <template #default="scope">

               <span>{{ parseTime(scope.row.operTime) }}</span>

               <span>{{ dayjs(form.operTime).format("YYYY-MM-DD") }}</span>

            </template>

         </el-table-column>

         <el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">

@@ -145,6 +149,7 @@
         :total="total"

         v-model:page="queryParams.pageNum"

         v-model:limit="queryParams.pageSize"

         :page-sizes="[10, 20, 30, 50, 100, 200]"

         @pagination="getList"

      />



@@ -165,9 +170,9 @@
               <el-col :span="24">

                  <el-form-item label="操作方法：">{{ form.method }}</el-form-item>

               </el-col>

               <el-col :span="24">

                  <el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>

               </el-col>

<!--               <el-col :span="24">-->

<!--                  <el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>-->

<!--               </el-col>-->

               <el-col :span="24">

                  <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>

               </el-col>

@@ -181,7 +186,7 @@
                  <el-form-item label="消耗时间：">{{ form.costTime }}毫秒</el-form-item>

               </el-col>

               <el-col :span="8">

                  <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>

                  <el-form-item label="操作时间：">{{ dayjs(form.operTime).format("YYYY-MM-DD") }}</el-form-item>

               </el-col>

               <el-col :span="24">

                  <el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>

@@ -200,6 +205,7 @@
<script setup name="Operlog">

import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog"

import {onMounted} from "vue";

import dayjs from "dayjs";



const { proxy } = getCurrentInstance()

const { sys_oper_type, sys_common_status } = proxy.useDict("sys_oper_type","sys_common_status")


 src/views/productionManagement/productionCosting/index.vue

@@ -124,26 +124,26 @@
      prop: "process",
      minWidth: 100,
    },
    {
      label: "工时（h）",
      prop: "workHour",
      minWidth: 100,
    },
    // {
    //   label: "工时（h）",
    //   prop: "workHour",
    //   minWidth: 100,
    // },
    {
      label: "生产数量",
      prop: "quantity",
      minWidth: 100,
    },
    {
      label: "工时定额",
      prop: "workHours",
      minWidth: 100,
    },
    {
      label: "工资",
      prop: "wages",
      minWidth: 100,
    },
    // {
    //   label: "工时定额",
    //   prop: "workHours",
    //   minWidth: 100,
    // },
    // {
    //   label: "工资",
    //   prop: "wages",
    //   minWidth: 100,
    // },
  ]);

  // 左侧汇总台账列（生产人、产量、工资、合格率）
@@ -158,11 +158,11 @@
      prop: "finishedNum",
      minWidth: 100,
    },
    {
      label: "工资",
      prop: "wages",
      minWidth: 100,
    },
    // {
    //   label: "工资",
    //   prop: "wages",
    //   minWidth: 100,
    // },
    {
      label: "合格率",
      prop: "outputRate",

 src/views/productionManagement/productionReporting/index.vue

@@ -186,11 +186,11 @@
      prop: "nickName",
      width: 120,
    },
    {
      label: "工时（h）",
      width: 100,
      prop: "workHour",
    },
    // {
    //   label: "工时（h）",
    //   width: 100,
    //   prop: "workHour",
    // },
    {
      label: "工序",
      prop: "process",

 src/views/reportAnalysis/reportManagement/index.vue

@@ -37,30 +37,30 @@
                  </div>
                </div>
              </div>
              <div class="typeNum">
                <div class="typeNum-left">
                  <img src="~@/assets/images/chartCard2.svg" alt="图表"
                    style="width: 40px; height: 40px; object-fit: contain;">
                  <div class="typeNum-left-text" style="color: #5EB334;">半成品</div>
                </div>
                <div class="typeNum-center">
                  <div class="typeNum-leftLine2">-</div>
                  <div class="typeNum-rightLine2"></div>
                </div>
                <div class="typeNum-right">
                  <div class="typeNum-right-top">
                    <div class="typeNum-right-top-name">总数量</div>
                    <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'totalCount') }} <span
                        class="unit">个</span></div>
                  </div>
                  <div class="typeNum-right-bottom">
                    <div class="typeNum-right-top-name">已完成数</div>
                    <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'completedCount') }} <span
                        class="unit">个</span>
                    </div>
                  </div>
                </div>
              </div>
<!--              <div class="typeNum">-->
<!--                <div class="typeNum-left">-->
<!--                  <img src="~@/assets/images/chartCard2.svg" alt="图表"-->
<!--                    style="width: 40px; height: 40px; object-fit: contain;">-->
<!--                  <div class="typeNum-left-text" style="color: #5EB334;">半成品</div>-->
<!--                </div>-->
<!--                <div class="typeNum-center">-->
<!--                  <div class="typeNum-leftLine2">-</div>-->
<!--                  <div class="typeNum-rightLine2"></div>-->
<!--                </div>-->
<!--                <div class="typeNum-right">-->
<!--                  <div class="typeNum-right-top">-->
<!--                    <div class="typeNum-right-top-name">总数量</div>-->
<!--                    <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'totalCount') }} <span-->
<!--                        class="unit">个</span></div>-->
<!--                  </div>-->
<!--                  <div class="typeNum-right-bottom">-->
<!--                    <div class="typeNum-right-top-name">已完成数</div>-->
<!--                    <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'completedCount') }} <span-->
<!--                        class="unit">个</span>-->
<!--                    </div>-->
<!--                  </div>-->
<!--                </div>-->
<!--              </div>-->
              <div class="typeNum">
                <div class="typeNum-left">
                  <img src="~@/assets/images/chartCard3.svg" alt="图表"
@@ -123,31 +123,31 @@
                  </div>
                </div>
              </div>
              <div class="quality-card green-card">
                <div class="quality-card-title">
                  <img src="~@/assets/images/chartCard2.svg" alt="半成品"
                    style="width: 24px; height: 24px; margin-right: 8px;">
                  半成品合格率
                </div>
                <div class="quality-card-content">
                  <div class="quality-item">
                    <div>
                      <div class="quality-item-label blue-label">完成率</div>
                      <div class="quality-item-tip">占比</div>
                      <div class="quality-item-value">{{ getPassRateStatValue(1, 'completionRate') }}</div>
                    </div>
                    <div class="quality-item-chart" ref="semiCompletionChart"></div>
                  </div>
                  <div class="quality-item">
                    <div>
                      <div class="quality-item-label green-label">合格率</div>
                      <div class="quality-item-tip">占比</div>
                      <div class="quality-item-value">{{ getPassRateStatValue(1, 'passRate') }}</div>
                    </div>
                    <div class="quality-item-chart" ref="semiQualityChart"></div>
                  </div>
                </div>
              </div>
<!--              <div class="quality-card green-card">-->
<!--                <div class="quality-card-title">-->
<!--                  <img src="~@/assets/images/chartCard2.svg" alt="半成品"-->
<!--                    style="width: 24px; height: 24px; margin-right: 8px;">-->
<!--                  半成品合格率-->
<!--                </div>-->
<!--                <div class="quality-card-content">-->
<!--                  <div class="quality-item">-->
<!--                    <div>-->
<!--                      <div class="quality-item-label blue-label">完成率</div>-->
<!--                      <div class="quality-item-tip">占比</div>-->
<!--                      <div class="quality-item-value">{{ getPassRateStatValue(1, 'completionRate') }}</div>-->
<!--                    </div>-->
<!--                    <div class="quality-item-chart" ref="semiCompletionChart"></div>-->
<!--                  </div>-->
<!--                  <div class="quality-item">-->
<!--                    <div>-->
<!--                      <div class="quality-item-label green-label">合格率</div>-->
<!--                      <div class="quality-item-tip">占比</div>-->
<!--                      <div class="quality-item-value">{{ getPassRateStatValue(1, 'passRate') }}</div>-->
<!--                    </div>-->
<!--                    <div class="quality-item-chart" ref="semiQualityChart"></div>-->
<!--                  </div>-->
<!--                </div>-->
<!--              </div>-->
              <div class="quality-card purple-card">
                <div class="quality-card-title">
                  <img src="~@/assets/images/chartCard3.svg" alt="成品"
@@ -202,10 +202,10 @@
                    <div class="chart-box-title">原材料总数</div>
                    <div class="chart-box-num">{{ getYearlyStatValue(0, 'totalCount') }}</div>
                  </div>
                  <div class="inspection-chart-box">
                    <div class="chart-box-title">半成品总数</div>
                    <div class="chart-box-num">{{ getYearlyStatValue(1, 'totalCount') }}</div>
                  </div>
<!--                  <div class="inspection-chart-box">-->
<!--                    <div class="chart-box-title">半成品总数</div>-->
<!--                    <div class="chart-box-num">{{ getYearlyStatValue(1, 'totalCount') }}</div>-->
<!--                  </div>-->
                  <div class="inspection-chart-box">
                    <div class="chart-box-title">成品总数</div>
                    <div class="chart-box-num">{{ getYearlyStatValue(2, 'totalCount') }}</div>
@@ -266,7 +266,7 @@
            <!-- Tab 选择器 -->
            <div class="tab-selector">
              <div class="tab-item" :class="{ active: activeTab === 'raw' }" @click="activeTab = 'raw'">原材料</div>
              <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">半成品</div>
<!--              <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">半成品</div>-->
              <div class="tab-item" :class="{ active: activeTab === 'final' }" @click="activeTab = 'final'">成品</div>
            </div>
          </el-card>
@@ -526,7 +526,8 @@
        containLabel: true,
      },
      legend: {
        data: ["原材料", "半成品", "成品"], // 图例数据
        // data: ["原材料", "半成品", "成品"], // 图例数据
        data: ["原材料", "成品"], // 图例数据
        icon: ["circle", "circle", "circle"],
        itemWidth: 10, // 设置图标宽度
        itemHeight: 10,
@@ -564,16 +565,16 @@
            color: "#409EFF",
          },
        },
        {
          name: "半成品",
          type: "bar",
          barWidth: "15%",

          data: monthlyCompletionDetailsData.value.map(item => item.processCount),
          itemStyle: {
            color: "#67C23A",
          },
        },
        // {
        //   name: "半成品",
        //   type: "bar",
        //   barWidth: "15%",
        //
        //   data: monthlyCompletionDetailsData.value.map(item => item.processCount),
        //   itemStyle: {
        //     color: "#67C23A",
        //   },
        // },
        {
          name: "成品",
          type: "bar",
@@ -607,7 +608,7 @@
          radius: "70%",
          data: [
            { value: getYearlyStatValue(0, 'totalCount'), name: "原材料", itemStyle: { color: "#1890FF" } },
            { value: getYearlyStatValue(1, 'totalCount'), name: "半成品", itemStyle: { color: "#F7BA1E" } },
            // { value: getYearlyStatValue(1, 'totalCount'), name: "半成品", itemStyle: { color: "#F7BA1E" } },
            { value: getYearlyStatValue(2, 'totalCount'), name: "成品", itemStyle: { color: "#14C9C9" } },
          ],
          label: {
@@ -655,7 +656,8 @@
      },
      // 图例配置
      legend: {
        data: ["原材料", "半成品", "成品"], // 图例数据
        // data: ["原材料", "半成品", "成品"], // 图例数据
        data: ["原材料", "成品"], // 图例数据
        icon: ["circle", "circle", "circle"],
        itemWidth: 10, // 设置图标宽度
        itemHeight: 10,
@@ -1161,7 +1163,7 @@

.typeNum {
  height: 100%;
  width: 33.33%;
  width: 50%;
  display: flex;
  align-items: center;
  justify-content: center;

 src/views/reportAnalysis/taxComparison/index.vue

@@ -2,7 +2,7 @@
  <div class="app-container vat-page">
    <el-row :gutter="20" class="vat-row">
      <!-- 左侧：增值税明细列表 -->
      <el-col :span="15" class="vat-col">
      <el-col :span="12" class="vat-col">
        <el-card shadow="never" class="vat-card">
          <template #header>
            <div class="card-header">
@@ -27,9 +27,9 @@
                    </el-tag>
                  </template>
                </el-table-column>
                <el-table-column prop="invoiceNo" label="发票号" min-width="140" show-overflow-tooltip />
<!--                <el-table-column prop="invoiceNo" label="发票号" min-width="140" show-overflow-tooltip />-->
                <el-table-column prop="salesContractNo" label="合同号" min-width="140" show-overflow-tooltip />
                <el-table-column prop="supplierName" label="供应商" min-width="100" show-overflow-tooltip />
<!--                <el-table-column prop="supplierName" label="供应商" min-width="100" show-overflow-tooltip />-->
                <el-table-column prop="customerName" label="客户" min-width="100" show-overflow-tooltip />
                <el-table-column prop="invoiceDate" label="开票日期" width="110" align="center" />
                <el-table-column prop="taxRate" label="税率" width="75" align="center">
@@ -62,7 +62,7 @@
      </el-col>

      <!-- 右侧：柱状对比图 -->
      <el-col :span="9" class="vat-col">
      <el-col :span="12" class="vat-col">
        <el-card shadow="never" class="vat-card">
          <template #header>
            <span class="card-title">进销项增值税对比</span>

 src/views/system/dept/index.vue

@@ -63,7 +63,7 @@
            </el-table-column>

            <el-table-column label="创建时间" align="center" prop="createTime" width="200">

                <template #default="scope">

                    <span>{{ parseTime(scope.row.createTime) }}</span>

                    <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

                </template>

            </el-table-column>

            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">


 src/views/system/dict/data.vue

@@ -105,7 +105,7 @@
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />

         <el-table-column label="创建时间" align="center" prop="createTime" width="180">

            <template #default="scope">

               <span>{{ parseTime(scope.row.createTime) }}</span>

               <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

            </template>

         </el-table-column>

         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">


 src/views/system/dict/index.vue

@@ -120,7 +120,7 @@
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />

         <el-table-column label="创建时间" align="center" prop="createTime" width="180">

            <template #default="scope">

               <span>{{ parseTime(scope.row.createTime) }}</span>

               <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

            </template>

         </el-table-column>

         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">


 src/views/system/post/index.vue

@@ -90,7 +90,7 @@
         </el-table-column>

         <el-table-column label="创建时间" align="center" prop="createTime" width="180">

            <template #default="scope">

               <span>{{ parseTime(scope.row.createTime) }}</span>

               <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

            </template>

         </el-table-column>

         <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">


 src/views/system/role/index.vue

@@ -108,11 +108,11 @@
               ></el-switch>

            </template>

         </el-table-column>

         <el-table-column label="创建时间" align="center" prop="createTime">

            <template #default="scope">

               <span>{{ parseTime(scope.row.createTime) }}</span>

            </template>

         </el-table-column>

<el-table-column label="创建时间" align="center" prop="createTime">

             <template #default="scope">

                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

             </template>

          </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

            <template #default="scope">

              <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">