xwt
2025-08-03 c47ec7b37e7f68c49b40fc4b59098e79626e66de
首检巡检
已修改4个文件
155 ■■■■ 文件已修改
manifest.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/QC/LLJ/Add.vue 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/QC/XJ/Add.vue 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
store/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,7 +2,7 @@
    "name" : "GS-MES-AP",
    "appid" : "__UNI__F08FAE3",
    "description" : "",
    "versionName" : "1.1.2.6",
    "versionName" : "1.1.2.7",
    "versionCode" : 1,
    "transformPx" : false,
    /* 5+App特有相关 */
pages/QC/LLJ/Add.vue
@@ -1882,7 +1882,7 @@
        font-family: 'Microsoft YaHei', 'Segoe UI', sans-serif;
        max-width: 1000px;
        margin: 0 auto;
        padding: 20px;
        padding: 20px 20px 100px 20px; /* 底部增加内边距为固定按钮留空间 */
        background-color: #fff;
        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
        min-height: 100vh;
@@ -2022,11 +2022,19 @@
    /* 表单下方操作按钮区样式 */
.bottom-action-buttons {
    display: flex;
    justify-content: flex-end;
    gap: 10px;
    margin: 20px 0;
    padding: 10px;
    justify-content: center;
    gap: 8px;
    padding: 12px;
    flex-wrap: wrap;
    align-items: center;
    position: fixed; /* 固定在屏幕底部 */
    bottom: 0; /* 距离底部0px */
    left: 0; /* 距离左边0px */
    right: 0; /* 距离右边0px */
    background-color: #fff; /* 背景色 */
    border-top: 1px solid #e9ecef; /* 顶部边框 */
    z-index: 1000; /* 确保在最上层 */
    box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1); /* 顶部阴影 */
}
    .action-btn {
@@ -2062,9 +2070,14 @@
    /* 小尺寸按钮样式 */
    .action-btn.small {
        padding: 8px 12px;
        font-size: 12px;
        min-height: 36px;
        padding: 10px 12px;
        font-size: 14px;
        min-height: 44px;
        white-space: nowrap;
        flex-shrink: 0;
        min-width: 80px;
        max-width: 120px;
        flex: 1;
    }
    /* 原有按钮样式保持兼容 */
@@ -2527,12 +2540,27 @@
        }
        .bottom-action-buttons {
            flex-direction: column;
            align-items: stretch;
            flex-direction: row;
            align-items: center;
            justify-content: center;
            padding: 8px;
            gap: 6px;
            position: fixed; /* 保持固定在屏幕底部 */
            bottom: 0;
            left: 0;
            right: 0;
            background-color: #fff;
            border-top: 1px solid #e9ecef;
            z-index: 1000;
            box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
        }
        .action-btn {
            width: 100%;
        .action-btn.small {
            min-width: 70px;
            max-width: 100px;
            padding: 8px 10px;
            font-size: 13px;
            min-height: 40px;
        }
        .inspection-table table {
pages/QC/XJ/Add.vue
@@ -24,10 +24,18 @@
              <view class="info-value">{{ formData.createDate }}</view>
            </view>
            <view class="info-item">
              <view class="info-label">生产车间</view>
              <picker v-if="isUpdate" class="picker-input" name="selector" :range="departmentList" range-key="departmentname"
                      @change="onDepartmentChange">
                <view class="picker-value">{{ getSelectedDepartmentName() || '请选择车间' }}</view>
              </picker>
              <view v-else class="info-value">{{ WORKSHOP }}</view>
            </view>
            <view class="info-item">
              <view class="info-label">线体编号</view>
              <picker v-if="isUpdate" class="picker-input" name="selector" :range="DAA020List"
              <picker v-if="isUpdate" class="picker-input" name="selector" :range="filteredDAA020List"
                      @change="onDaa020Change">
                <view class="picker-value">{{ DAA020List[DAA020Index] || '请选择' }}</view>
                <view class="picker-value">{{ filteredDAA020List[DAA020Index] || '请选择' }}</view>
              </picker>
              <view v-else class="info-value">{{ formData.daa020 }}</view>
            </view>
@@ -163,6 +171,7 @@
  
        DAA020List: [],
        DAA020Index: -1,
        filteredDAA020List: [],
  
        DAA001List: [],
        DAA001Index: -1,
@@ -186,6 +195,11 @@
  
        remarks: "",
        remarksPopup: false,
        // 部门选择相关
        departmentList: [],
        selectedDepartment: '',
        WORKSHOP: '',
      };
    },
    onLoad(options) {
@@ -215,7 +229,11 @@
        }).then(res => {
          this.lineList = res.data.tbBillList;
          this.DAA020List = res.data.tbBillList.map(item => item.lineName);
          this.filteredDAA020List = this.DAA020List; // 初始时显示所有线体
        })
        // 获取部门列表
        this.loadDepartments();
      }
    },
    methods: {
@@ -283,6 +301,81 @@
          this.isUpdate = false;
        });
      },
      // 加载部门列表
      loadDepartments() {
        this.$post({
          url: "/XJ/getDepartmentsWithLines"
        }).then(res => {
          if (res.status === 0) {
            this.departmentList = res.data.tbBillList;
          } else {
            this.$showMessage("获取部门列表失败");
          }
        });
      },
      // 部门选择变化处理
      onDepartmentChange(e) {
        const index = e.detail.value;
        if (index >= 0 && index < this.departmentList.length) {
          const selectedDept = this.departmentList[index];
          this.selectedDepartment = selectedDept.departmentid;
          this.WORKSHOP = selectedDept.departmentname;
          // 根据选中的部门过滤线体列表
          this.filterLinesByDepartment(selectedDept.departmentid);
          // 保存部门选择
          this.saveDepartmentSelection();
        }
      },
      // 获取选中的部门名称
      getSelectedDepartmentName() {
        if (!this.selectedDepartment) return '';
        const dept = this.departmentList.find(item => item.departmentid === this.selectedDepartment);
        return dept ? dept.departmentname : '';
      },
      // 保存部门选择
      saveDepartmentSelection() {
        if (this.formData.id && this.selectedDepartment) {
          this.$post({
            url: "/XJ/saveDepartmentSelection",
            data: {
              id: this.formData.id,
              departmentId: this.selectedDepartment,
              departmentName: this.WORKSHOP
            }
          }).then(res => {
            if (res.status === 0) {
              this.$showMessage("部门选择已保存");
            }
          });
        }
      },
      // 根据部门过滤线体列表
      filterLinesByDepartment(departmentId) {
        this.$post({
          url: "/XJ/getLinesByDepartment",
          data: {
            departmentId: departmentId
          }
        }).then(res => {
          if (res.status === 0) {
            this.filteredDAA020List = res.data.tbBillList.map(item => item.lineName);
            this.lineList = res.data.tbBillList;
            // 重置线体选择索引
            this.DAA020Index = -1;
            this.formData.daa020 = '';
          } else {
            this.$showMessage("获取线体列表失败");
          }
        });
      },
      //生产线别选择并初始话工单号
      onDaa020Change(event) {
        //获取生产线别的下标地址
store/index.js
@@ -10,9 +10,9 @@
            networkFlag:'内网', 
            serverURLInt:'http://192.168.11.251:10055',//服务器体检 10.0.1.104:10054
            serverURL:'http://localhost:10055',//本地调试地址
            //serverAPI:'http://localhost:5184/api',//当前正在使用的服务器,默认为外网  localhost
            serverAPI:'http://localhost:5184/api',//当前正在使用的服务器,默认为外网  localhost
            //serverAPI:'http://192.168.1.22:10054/api',//内网 
            serverAPI:'http://36.26.21.214:10055/api',
            //serverAPI:'http://36.26.21.214:10055/api',
            ftpServer:'ftp://36.26.21.214',//FTP服务器地址
        }
    },