9b18523c852a24806937ebb4de3a231abef9173d..741eea3ed05c978c21ec4048c0bb45a721ff615a
2024-05-11 zss
车间订单的导出去掉
741eea 对比 | 目录
2024-05-08 zss
Merge remote-tracking branch 'origin/master'
dbe4d7 对比 | 目录
2024-05-08 zss
工单的工作站修改
7aa0da 对比 | 目录
已修改5个文件
41 ■■■■ 文件已修改
src/views/plan/manufacturingorder/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/operationtask/operationtask-form.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/product/workbench/workReportCard.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/processconfiguration/index.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/manufacturingorder/index.vue
@@ -100,14 +100,14 @@
            >刷新ifs车间订单号
          </el-button> -->
          <el-button
          <!-- <el-button
          v-if="permissions.manufacturingorder_export"
            @click="exportExcel"
            type="primary"
            style="margin-left:10px;"
            :loading="loadingExcel"
            >导出
          </el-button>
          </el-button> -->
          <el-button
          v-if="permissions.manufacturingorder_label_print"
            @click="labelPrint"
src/views/plan/operationtask/operationtask-form.vue
@@ -157,7 +157,7 @@
                      </el-col>
                    </el-row>
                    <el-row :gutter="10">
                      <el-col :span="15">
                      <el-col :span="14">
                        <el-form-item label="计划时间" prop="localDateTimes">
                          <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
                            type="datetimerange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
@@ -592,7 +592,7 @@
        workCenter: [
          { required: true, message: '工作中心不能为空', trigger: 'change' }
        ],
        workstations: [
        workstationId: [
          { required: true, message: '工作站不能为空', trigger: 'change' }
        ],
        plannedQuantity: [
src/views/product/workbench/workReportCard.vue
@@ -126,10 +126,10 @@
          <!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
          :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >交班
        </el-button> -->
        <!-- <el-button class="submit-out-btn" type="primary"
        <el-button class="submit-out-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
            :loading="submitLoading">提交
          </el-button> -->
          </el-button>
          <el-button class="batch-out-del-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="deleteList()">删除
          </el-button>
src/views/quality/processconfiguration/index.vue
@@ -170,6 +170,18 @@
            // render: { fun: this.addOrUpdateHandle }
              }
          },
          {
              minWidth: '120',
              prop: 'state',
              label: '状态',
              isTrue: true,
              isSearch: true,
              searchInfoType: 'select',
              formatter: this.formatInsState,
              optList: () => {
                  return this.StateList
              }
          },
          // 检验编号
          {
            minWidth: '140',
@@ -264,18 +276,7 @@
               searchInfoType: 'datetimerange',
               formatter: this.formatDateTime,
           },
          {
              minWidth: '120',
              prop: 'state',
              label: '状态',
              isTrue: true,
              isSearch: true,
              searchInfoType: 'select',
              formatter: this.formatInsState,
              optList: () => {
                  return this.StateList
              }
          },
          // {
          //   minWidth: '120',
          //   prop: '',
vue.config.js
@@ -6,8 +6,8 @@
// const url = 'https://ztms-mes.chinaztt.cn/'
  // const url = 'http://localhost:9999'
const url = 'http://192.168.32.45:9999'
const url = 'http://localhost:9999'
//const url = 'http://192.168.32.45:9999'
const localUrl = 'http://localhost:8089'