湟水峡app： 1.部署修改

gaoluyang

6 天以前 476f93f5ab55ff516f0e9cefee5abdd24fab835a

 src/pages/index.vue

@@ -18,137 +18,21 @@
    <view class="hero-section">
      <view class="bg-img">
        <view class="hero-content">
          <text class="hero-title">军泰伟业</text>
          <text class="hero-title">湟水峡</text>
        </view>
        <view class="hero-wave"></view>
      </view>
    </view>
    <!--      <view class="notice-section">-->
    <!--         <view class="notice">-->
    <!--            <view class="notice-content">-->
    <!--               <view class="notice-left">-->
    <!--                  <text class="notice-status">通知</text>-->
    <!--               </view>-->
    <!--               <view class="notice-separator"></view>-->
    <!--               <view class="notice-right">-->
    <!--                  <text class="notice-label">{{currentStatus}}</text>-->
    <!--                  <text class="notice-text">当日销售设备数:<text class="notice-number">{{number}}<text class="notice-unit">个</text></text></text>-->
    <!--               </view>-->
    <!--            </view>-->
    <!--         </view>-->
    <!--      </view>-->
    <!-- 营销管理模块 -->
    <!--    <view class="common-module marketing-module">-->
    <!--      <view class="module-header">-->
    <!--        <view class="module-title-container">-->
    <!--          <text class="module-title">营销管理</text>-->
    <!--        </view>-->
    <!--      </view>-->
    <!--      <view class="module-content">-->
    <!--        <up-grid :border="false"-->
    <!--                 col="4">-->
    <!--          <up-grid-item v-for="(item, index) in marketingItems"-->
    <!--                        :key="index"-->
    <!--                        @click="handleCommonItemClick(item)">-->
    <!--            <view class="icon-container"-->
    <!--                  :style="{ background: item.bgColor }">-->
    <!--              <up-icon :name="item.icon"-->
    <!--                       :size="58"-->
    <!--                       color="#ffffff"></up-icon>-->
    <!--            </view>-->
    <!--            <text class="item-label">{{item.label}}</text>-->
    <!--          </up-grid-item>-->
    <!--        </up-grid>-->
    <!--      </view>-->
    <!--    </view>-->
    <!--    &lt;!&ndash; 采购管理模块 &ndash;&gt;-->
    <!--    <view class="common-module purchase-module">-->
    <!--      <view class="module-header">-->
    <!--        <view class="module-title-container">-->
    <!--          <text class="module-title">采购管理</text>-->
    <!--        </view>-->
    <!--      </view>-->
    <!--      <view class="module-content">-->
    <!--        <up-grid :border="false"-->
    <!--                 col="4">-->
    <!--          <up-grid-item v-for="(item, index) in purchaseItems"-->
    <!--                        :key="index"-->
    <!--                        @click="handleCommonItemClick(item)">-->
    <!--            <view class="icon-container"-->
    <!--                  :style="{ background: item.bgColor }">-->
    <!--              <up-icon :name="item.icon"-->
    <!--                       :size="58"-->
    <!--                       color="#ffffff"></up-icon>-->
    <!--            </view>-->
    <!--            <text class="item-label">{{item.label}}</text>-->
    <!--          </up-grid-item>-->
    <!--        </up-grid>-->
    <!--      </view>-->
    <!--    </view>-->
    <!--    &lt;!&ndash; 协同办公模块 &ndash;&gt;-->
    <!--    <view class="common-module collaboration-module">-->
    <!--      <view class="module-header">-->
    <!--        <view class="module-title-container">-->
    <!--          <text class="module-title">协同办公</text>-->
    <!--        </view>-->
    <!--      </view>-->
    <!--      <view class="module-content">-->
    <!--        <up-grid :border="false"-->
    <!--                 col="4">-->
    <!--          <up-grid-item v-for="(item, index) in collaborationItems"-->
    <!--                        :key="index"-->
    <!--                        @click="handleCommonItemClick(item)">-->
    <!--            <view class="icon-container"-->
    <!--                  :style="{ background: item.bgColor }">-->
    <!--              <up-icon :name="item.icon"-->
    <!--                       :size="58"-->
    <!--                       color="#ffffff"></up-icon>-->
    <!--            </view>-->
    <!--            <text class="item-label">{{item.label}}</text>-->
    <!--          </up-grid-item>-->
    <!--        </up-grid>-->
    <!--      </view>-->
    <!--    </view>-->
    <!-- 生产管控模块 -->
    <!--      <view class="common-module production-module">-->
    <!--         <view class="module-header">-->
    <!--            <view class="module-title-container">-->
    <!--               <text class="module-title">生产管控</text>-->
    <!--            </view>-->
    <!--         </view>-->
    <!--         <view class="module-content">-->
    <!--            <up-grid-->
    <!--               :border="false"-->
    <!--               col="4"-->
    <!--            >-->
    <!--               <up-grid-item-->
    <!--                  v-for="(item, index) in productionItems"-->
    <!--                  :key="index"-->
    <!--                  @click="handleCommonItemClick(item)"-->
    <!--               >-->
    <!--                  <view class="icon-container" :style="{ background: item.bgColor }">-->
    <!--                     <up-icon-->
    <!--                        :name="item.icon"-->
    <!--                        :size="58"-->
    <!--                        color="#ffffff"-->
    <!--                     ></up-icon>-->
    <!--                  </view>-->
    <!--                  <text class="item-label">{{item.label}}</text>-->
    <!--               </up-grid-item>-->
    <!--            </up-grid>-->
    <!--         </view>-->
    <!--      </view>-->
    <!-- 生产管控模块 -->
    <view class="common-module equipment-module">
    <view class="common-module collaboration-module">
      <view class="module-header">
        <view class="module-title-container">
          <text class="module-title">生产管控</text>
          <text class="module-title">协同办公</text>
        </view>
      </view>
      <view class="module-content">
        <up-grid :border="false"
                 col="4">
          <up-grid-item v-for="(item, index) in productionItems"
          <up-grid-item v-for="(item, index) in collaborationItems"
                        :key="index"
                        @click="handleCommonItemClick(item)">
            <view class="icon-container"
@@ -163,29 +47,29 @@
      </view>
    </view>
    <!-- 设备管理模块 -->
    <!--    <view class="common-module equipment-module">-->
    <!--      <view class="module-header">-->
    <!--        <view class="module-title-container">-->
    <!--          <text class="module-title">设备管理</text>-->
    <!--        </view>-->
    <!--      </view>-->
    <!--      <view class="module-content">-->
    <!--        <up-grid :border="false"-->
    <!--                 col="4">-->
    <!--          <up-grid-item v-for="(item, index) in equipmentItems"-->
    <!--                        :key="index"-->
    <!--                        @click="handleCommonItemClick(item)">-->
    <!--            <view class="icon-container"-->
    <!--                  :style="{ background: item.bgColor }">-->
    <!--              <up-icon :name="item.icon"-->
    <!--                       :size="58"-->
    <!--                       color="#ffffff"></up-icon>-->
    <!--            </view>-->
    <!--            <text class="item-label">{{item.label}}</text>-->
    <!--          </up-grid-item>-->
    <!--        </up-grid>-->
    <!--      </view>-->
    <!--    </view>-->
        <view class="common-module equipment-module">
          <view class="module-header">
            <view class="module-title-container">
              <text class="module-title">设备管理</text>
            </view>
          </view>
          <view class="module-content">
            <up-grid :border="false"
                     col="4">
              <up-grid-item v-for="(item, index) in equipmentItems"
                            :key="index"
                            @click="handleCommonItemClick(item)">
                <view class="icon-container"
                      :style="{ background: item.bgColor }">
                  <up-icon :name="item.icon"
                           :size="58"
                           color="#ffffff"></up-icon>
                </view>
                <text class="item-label">{{item.label}}</text>
              </up-grid-item>
            </up-grid>
          </view>
        </view>
  </view>
</template>

@@ -279,10 +163,6 @@
  // 协同办公功能数据
  const collaborationItems = reactive([
    {
      icon: "/static/images/icon/xietongshenpi@2x.png",
      label: "协同审批",
    },
    {
      icon: "/static/images/icon/kehubaifang@2x.png",
      label: "客户拜访",
    },
@@ -319,41 +199,9 @@

  // 设备管理功能数据
  const equipmentItems = reactive([
    // {
    //    icon: '/static/images/icon/shebeitaizhang@2x.png',
    //    label: '设备台账',
    // },
    {
      icon: "/static/images/icon/shbeibaoxiu@2x.png",
      label: "设备报修",
    },
    {
      icon: "/static/images/icon/shbeibaoyang@2x.png",
      label: "设备保养",
    },
    {
      icon: "/static/images/icon/xunjianshangchuan@2x.png",
      label: "巡检上传",
    },
    {
      icon: "/static/images/icon/guzhangfenxi@2x.png",
      label: "分析追溯",
      bgColor: "#ff9800",
    },
    {
      icon: "/static/images/icon/zhinengpaidan@2x.png",
      label: "智能派单",
      bgColor: "#ff6b35",
    },
    {
      icon: "/static/images/icon/zuoyezhidao@2x.png",
      label: "作业指导",
      bgColor: "#4caf50",
    },
    {
      icon: "/static/images/icon/jieguoyanzheng@2x.png",
      label: "结果验证",
      bgColor: "#9c27b0",
    },
  ]);

@@ -419,6 +267,71 @@
      case "供应商往来":
        uni.navigateTo({
          url: "/pages/procurementManagement/paymentLedger/index",
        });
        break;
      case "公出管理":
        uni.navigateTo({
          url: "/pages/cooperativeOffice/collaborativeApproval/index1",
        });
        break;
      case "请假管理":
        uni.navigateTo({
          url: "/pages/cooperativeOffice/collaborativeApproval/index2",
        });
        break;
      case "出差管理":
        uni.navigateTo({
          url: "/pages/cooperativeOffice/collaborativeApproval/index3",
        });
        break;
      case "报销管理":
        uni.navigateTo({
          url: "/pages/cooperativeOffice/collaborativeApproval/index4",
        });
        break;
      case "采购管理":
        uni.navigateTo({
          url: "/pages/cooperativeOffice/collaborativeApproval/index5",
        });
        break;
      case "报价管理":
        uni.navigateTo({
          url: "/pages/cooperativeOffice/collaborativeApproval/index6",
        });
        break;
      case "出库管理":
        uni.navigateTo({
          url: "/pages/cooperativeOffice/collaborativeApproval/index7",
        });
        break;
      case "会议设置":
        uni.navigateTo({
          url: "/pages/managementMeetings/meetingSettings/index",
        });
        break;
      case "会议列表":
        uni.navigateTo({
          url: "/pages/managementMeetings/meetingList/index",
        });
        break;
      case "会议申请":
        uni.navigateTo({
          url: "/pages/managementMeetings/meetApplication/index",
        });
        break;
      case "会议审批":
        uni.navigateTo({
          url: "/pages/managementMeetings/meetExamine/index",
        });
        break;
      case "会议发布":
        uni.navigateTo({
          url: "/pages/managementMeetings/meetPublish/index",
        });
        break;
      case "会议总结":
        uni.navigateTo({
          url: "/pages/managementMeetings/meetSummary/index",
        });
        break;
      case "协同审批":
@@ -535,7 +448,7 @@

        // 判断扫描结果是否为纯数字（id）
        const isNumericId = /^\d+$/.test(scanResult.trim());
        

        if (isNumericId) {
          // 如果是纯数字，根据 id 获取工单数据
          const workOrderId = scanResult.trim();
@@ -543,20 +456,23 @@
          try {
            const workRes = await getProductWorkOrderById({ id: workOrderId });
            modal.closeLoading();
            

            console.log("工单查询结果:", workRes);
            

            if (workRes.code === 200 && workRes.data) {
              // 新接口返回的是单个对象，不是数组
              const workData = workRes.data;
              console.log("工单数据:", workData);
              

              orderRow = JSON.stringify({
                id: workData.id || workOrderId,
                planQuantity: workData.planQuantity-workData.completeQuantity,
                productProcessRouteItemId: workData.productProcessRouteItemId || workData.产品工艺路线项ID || "",
                planQuantity: workData.planQuantity - workData.completeQuantity,
                productProcessRouteItemId:
                  workData.productProcessRouteItemId ||
                  workData.产品工艺路线项ID ||
                  "",
              });
              

              console.log("构造的orderRow:", orderRow);
            } else {
              modal.msgError("未找到对应的工单信息");
@@ -585,7 +501,7 @@
            console.error(e, "解析失败====????=====");
            orderRow = "";
          }
          

          // 验证是否为有效的JSON
          try {
            JSON.parse(orderRow);
@@ -594,7 +510,7 @@
            return;
          }
        }
        

        console.log(orderRow, "orderRow======@@@@@@@@");
        // 扫码成功后跳转到生产报工页面，并传递orderRow参数
        uni.navigateTo({