modified: src/views/plan/customerorder/index.vue modified: src/views/...

zouyu

2023-11-13 4bf8bbebde0131fb5804a9aab00f9e7cf0718b52

	modified:   src/views/plan/customerorder/index.vue
	modified:   src/views/plan/manufacturingorder/index.vue
	modified:   src/views/plan/manufacturingorder/productorder-form.vue
	modified:   src/views/plan/masterproductionschedule/index.vue
	modified:   src/views/plan/operationtask/index.vue

 src/views/plan/customerorder/index.vue

@@ -69,9 +69,9 @@
            style="margin-left:10px;"
            type="primary"
            @click="pushOtc"
            >推送ERP</el-button
            >推送OTC</el-button
          >
          <el-button
          <!-- <el-button
            style="margin-left:10px;"
            type="primary"
            @click="importOutPutBatch"
@@ -82,7 +82,7 @@
            type="primary"
            @click="exportStandBook"
            >导出台账</el-button
          >
          > -->
          <el-button
            v-if="permissions.plan_customerorder_return"
            style="margin-left:10px;"
@@ -1019,12 +1019,6 @@
            fun: this.stockHandle
          },
          {
            text: '箱码信息导出',
            type: 'text',
            size: 'small',
            fun: this.packageExportHandle
          },
          {
            text: '作废',
            type: 'text',
            size: 'small',
@@ -1224,7 +1218,7 @@
    }
    if (this.permissions.customerorder_ifs_line) {
      this.table.toolbar.push({
        text: '获取ERP行号',
        text: '获取OTC行号',
        type: 'primary',
        fun: this.pullIfsLineNo,
        disabled: false,

 src/views/plan/manufacturingorder/index.vue

@@ -53,19 +53,19 @@
            @command="issueMaterialHandleCommand"
            style="margin-left:10px;"
          >
            <el-button>
            <!-- <el-button>
              发料<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
            </el-button> -->
            <!-- <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :command="item.command"
                v-for="item in issueMaterialArr"
                :disabled="item.disabled"
                >{{ item.label }}</el-dropdown-item
              >
            </el-dropdown-menu>
            </el-dropdown-menu> -->
          </el-dropdown>
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_orderto_ifs"
            @click="commitOrderIfs()"
            type="primary"
@@ -88,7 +88,7 @@
            style="margin-left:10px;"
            :loading="loadingStructIfs"
            >物料同步ERP
          </el-button>
          </el-button> -->
          <el-button
            v-if="permissions.manufacturingorder_refresh_ifsorder"
            @click="refreshIfsorder()"
@@ -230,7 +230,7 @@
      taskTypeArr: [],
      stateTagArr: [
        {
          label: '已计划',
          label: '待下达',
          command: 'PLAN',
          disabled: false,
          permitArr: ['03completed', '04canceled']
@@ -269,7 +269,7 @@
        }
      ],
      states: [
        { value: '01planned', label: '已计划' },
        { value: '01planned', label: '待下达' },
        { value: '02issued', label: '已下达' },
        {
          value: '03completed',
@@ -408,24 +408,24 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'printRequirement',
            label: '印字要求',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'lengthRequirement',
            label: '盘长要求',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'printRequirement',
          //   label: '印字要求',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '120',
          //   prop: 'lengthRequirement',
          //   label: '盘长要求',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'orderRemark',

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -108,27 +108,6 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="外护颜色" prop="outerColor">
                <el-input
                  readonly
                  v-model="dataForm.outerColor"
                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>

            <el-col :span="6">
              <el-form-item label="绝缘颜色" prop="insulationColor">
                <el-input
                  v-model="dataForm.insulationColor"
                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>
          </el-row>

          <el-row :gutter="10">
            <el-col :span="6">
              <el-form-item label="备注" prop="remark">
                <el-input v-model="dataForm.remark" placeholder=""></el-input>
              </el-form-item>
@@ -151,6 +130,26 @@
                </el-select>
              </el-form-item>
            </el-col>
            <!-- <el-col :span="6">
              <el-form-item label="外护颜色" prop="outerColor">
                <el-input
                  readonly
                  v-model="dataForm.outerColor"
                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>

            <el-col :span="6">
              <el-form-item label="绝缘颜色" prop="insulationColor">
                <el-input
                  v-model="dataForm.insulationColor"
                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col> -->
          </el-row>
    <!-- <el-row :gutter="10">
            <el-col :span="8">
              <el-col
                :span="8"
@@ -189,7 +188,7 @@
                </el-switch>
              </el-form-item>
            </el-col>
            <!-- <el-col :span="2">
            <el-col :span="2">
              <el-form-item label="BOM确认">
                <el-switch >
                </el-switch>
@@ -206,8 +205,8 @@
                <el-switch >
                </el-switch>
              </el-form-item>
            </el-col> -->
          </el-row>
            </el-col>
          </el-row> -->
        </div>
        <div class="productorder-detail">
          <el-card class="productorder-list">
@@ -244,13 +243,13 @@
                          </el-select>
                        </el-form-item>
                      </el-col>
                      <el-col :span="8">
                      <!-- <el-col :span="8">
                        <el-form-item label-width="0px">
                          <el-checkbox v-model="currentRouting.master" disabled
                            >默认工艺路线
                          </el-checkbox>
                        </el-form-item>
                      </el-col>
                      </el-col> -->
                    </el-row>
                    <el-row>
                      <el-col :span="24">

 src/views/plan/masterproductionschedule/index.vue

@@ -104,6 +104,11 @@
            style="margin-left:10px;"
            >SCM状态变更
          </el-button>
          <el-button
            type="primary"
            style="margin-left:10px;"
            >新增采购计划
          </el-button>
        </template>
      </ttable>

@@ -593,34 +598,39 @@
        toolbar: [],
        operator: [
          {
            text: '订单预留',
            text: '作废',
            type: 'text',
            size: 'small',
            fun: this.customReserved
          },
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.stockHandle
          },
          {
            text: '来源',
            type: 'text',
            size: 'small',
            fun: this.searchMasterPlanSourceHandle
          },
          {
            text: '订单',
            type: 'text',
            size: 'small',
            fun: this.searchOrderHandle
          }
          // {
          //   text: '订单预留',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.customReserved
          // },
          // {
          //   text: '查看库存',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.stockHandle
          // },
          // {
          //   text: '来源',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchMasterPlanSourceHandle
          // },
          // {
          //   text: '订单',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchOrderHandle
          // }
        ],
        operatorConfig: {
          fixed: 'right',
          label: '操作',
          width: 240,
          width: 100,
          minWidth: 100
        }
      },

 src/views/plan/operationtask/index.vue

@@ -36,15 +36,24 @@
          >
            合并工单
          </el-button>
          <el-button style="margin-left:10px" @click="openTaskOrder">
            优先级
          </el-button>
          <el-button
          type="primary"
            v-if="permissions.operationtask_pallet_transport"
            style="margin-left:10px"
            @click="openTaskMaterial"
          >
            货盘运输
            打印模具领用清单
          </el-button>
          <el-button style="margin-left:10px" @click="openTaskOrder">
            优先级
          <el-button
          type="primary"
            v-if="permissions.operationtask_pallet_transport"
            style="margin-left:10px"
            @click="openTaskMaterial"
          >
            打印物料领用清单
          </el-button>
        </template>
      </ttable>
@@ -379,24 +388,24 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'discNum',
            label: '盘数',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'reelSpec',
            label: '载具规格',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'discNum',
          //   label: '盘数',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '120',
          //   prop: 'reelSpec',
          //   label: '载具规格',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            width: '130',
            prop: 'ratio',