军泰伟业 1.修改生产模块的图纸编号和规格型号字段

gaoluyang

8 天以前 06bea42e538d820b1837c14ba87691a63bf51936

军泰伟业
1.修改生产模块的图纸编号和规格型号字段

 src/views/basicData/product/ProductSelectDialog.vue

@@ -5,8 +5,8 @@
        <el-input v-model="query.productName" placeholder="输入产品大类" clearable @keyup.enter="onSearch" />
      </el-form-item>

      <el-form-item label="型号名称">
        <el-input v-model="query.model" placeholder="输入型号名称" clearable @keyup.enter="onSearch" />
      <el-form-item label="图纸编号">
        <el-input v-model="query.model" placeholder="输入图纸编号" clearable @keyup.enter="onSearch" />
      </el-form-item>

      <el-form-item>
@@ -21,8 +21,8 @@
      <el-table-column type="selection" width="55" />
      <el-table-column type="index" label="序号" width="60" />
      <el-table-column prop="productName" label="产品大类" min-width="160" />
      <el-table-column prop="drawingNumber" label="规格型号" min-width="160" />
      <el-table-column prop="model" label="图纸编号" min-width="200" />
      <el-table-column prop="drawingNumber" label="规格型号" min-width="160" />
      <el-table-column prop="unit" label="单位" min-width="160" />
    </el-table>


 src/views/productionManagement/processRoute/ItemsForm.vue

@@ -190,8 +190,8 @@

const tableColumn = ref([
  { label: "产品名称", prop: "productName", width: 180 },
  { label: "产品图纸编号", prop: "drawingNumber", width: 150 },
  { label: "规格名称", prop: "model", width: 150 },
  { label: "图纸编号", prop: "model", width: 150 },
  { label: "规格型号", prop: "drawingNumber", width: 150 },
  { label: "单位", prop: "unit", width: 80 },
  { label: "工序名称", prop: "processId", width: 180 },
  {

 src/views/productionManagement/processRoute/index.vue

@@ -75,13 +75,13 @@
    label: "产品名称",
    prop: "productName",
  },
  {
    label: "产品图纸编号",
    prop: "drawingNumber",
  },
    {
        label: "图纸编号",
        prop: "model",
    },
  {
    label: "规格名称",
    prop: "model",
    prop: "drawingNumber",
  },
  {
    label: "BOM编号",

 src/views/productionManagement/processRoute/processRouteItem/index.vue

@@ -21,20 +21,20 @@
            <span class="info-value">{{ routeInfo.productName || '-' }}</span>
          </div>
        </div>
                <div class="info-item">
                    <div class="info-label-wrapper">
                        <span class="info-label">图纸编号</span>
                    </div>
                    <div class="info-value-wrapper">
                        <span class="info-value">{{ routeInfo.model || '-' }}</span>
                    </div>
                </div>
        <div class="info-item">
          <div class="info-label-wrapper">
            <span class="info-label">产品图纸编号</span>
            <span class="info-label">规格型号</span>
          </div>
          <div class="info-value-wrapper">
            <span class="info-value">{{ routeInfo.drawingNumber || '-' }}</span>
          </div>
        </div>
        <div class="info-item">
          <div class="info-label-wrapper">
            <span class="info-label">规格名称</span>
          </div>
          <div class="info-value-wrapper">
            <span class="info-value">{{ routeInfo.model || '-' }}</span>
          </div>
        </div>
        <div class="info-item">
@@ -88,8 +88,8 @@
        </template>
      </el-table-column>
      <el-table-column label="产品名称" prop="productName" min-width="160" />
      <el-table-column label="图纸编号" prop="drawingNumber" min-width="160" />
      <el-table-column label="规格名称" prop="model" min-width="140" />
      <el-table-column label="图纸编号" prop="model" min-width="140" />
      <el-table-column label="规格型号" prop="drawingNumber" min-width="160" />
      <el-table-column label="单位" prop="unit" width="100" />
      <el-table-column label="是否质检" prop="isQuality" width="100">
        <template #default="scope">

 src/views/productionManagement/productStructure/Detail/index.vue

@@ -34,27 +34,27 @@
                      style="width: 100%">
              <el-table-column prop="productName"
                               label="产品" />
                            <el-table-column prop="model"
                                                             label="图纸编号">
                                <template #default="{ row, $index }">
                                    <el-form-item v-if="dataValue.isEdit"
                                                                :rules="[{ required: true, message: '请选择规格', trigger: ['blur','change'] }]"
                                                                style="margin: 0">
                                        <el-select v-model="row.model"
                                                             placeholder="请选择规格"
                                                             clearable
                                                             :disabled="!dataValue.isEdit || dataValue.dataList.some(item => (item as any).tempId === row.tempId)"
                                                             style="width: 100%"
                                                             @visible-change="(v) => { if (v) openDialog(row.tempId) }">
                                            <el-option v-if="row.model"
                                                                 :label="row.model"
                                                                 :value="row.model" />
                                        </el-select>
                                    </el-form-item>
                                </template>
                            </el-table-column>
              <el-table-column prop="drawingNumber"
                               label="产品图纸编号" />
              <el-table-column prop="model"
                               label="规格">
                <template #default="{ row, $index }">
                  <el-form-item v-if="dataValue.isEdit"
                                :rules="[{ required: true, message: '请选择规格', trigger: ['blur','change'] }]"
                                style="margin: 0">
                    <el-select v-model="row.model"
                               placeholder="请选择规格"
                               clearable
                               :disabled="!dataValue.isEdit || dataValue.dataList.some(item => (item as any).tempId === row.tempId)"
                               style="width: 100%"
                               @visible-change="(v) => { if (v) openDialog(row.tempId) }">
                      <el-option v-if="row.model"
                                 :label="row.model"
                                 :value="row.model" />
                    </el-select>
                  </el-form-item>
                </template>
              </el-table-column>
                               label="规格型号" />
              <el-table-column prop="processName"
                               label="消耗工序">
                <template #default="{ row, $index }">
@@ -145,10 +145,10 @@
                       prop="bomNo" />
      <el-table-column label="产品名称"
                       prop="productName" />
      <el-table-column label="产品图纸编号"
                       prop="drawingNumber" />
            <el-table-column label="图纸编号"
                                             prop="model" />
      <el-table-column label="规格型号"
                       prop="model" />
                       prop="drawingNumber" />
    </el-table>
    <product-select-dialog v-if="dataValue.showProductDialog"
                           v-model:model-value="dataValue.showProductDialog"

 src/views/productionManagement/productStructure/StructureEdit.vue

@@ -35,30 +35,30 @@
              <el-table-column prop="productName"
                               label="产品"
                               width="150" />
                            <el-table-column prop="model"
                                                             label="图纸编号"
                                                             width="150">
                                <template #default="{ row, $index }">
                                    <el-form-item v-if="dataValue.isEdit"
                                                                :prop="`dataList.${$index}.model`"
                                                                :rules="[{ required: true, message: '请选择图纸编号', trigger: ['blur','change'] }]"
                                                                style="margin: 0">
                                        <el-select v-model="row.model"
                                                             placeholder="请选择产品"
                                                             clearable
                                                             :disabled="!dataValue.isEdit"
                                                             style="width: 100%"
                                                             @visible-change="(v) => { if (v) openDialog($index) }">
                                            <el-option v-if="row.model"
                                                                 :label="row.model"
                                                                 :value="row.model" />
                                        </el-select>
                                    </el-form-item>
                                </template>
                            </el-table-column>
              <el-table-column prop="drawingNumber"
                               label="图纸编号"
                               label="规格型号"
                               width="150" />
              <el-table-column prop="model"
                               label="规格"
                               width="150">
                <template #default="{ row, $index }">
                  <el-form-item v-if="dataValue.isEdit"
                                :prop="`dataList.${$index}.model`"
                                :rules="[{ required: true, message: '请选择规格', trigger: ['blur','change'] }]"
                                style="margin: 0">
                    <el-select v-model="row.model"
                               placeholder="请选择产品"
                               clearable
                               :disabled="!dataValue.isEdit"
                               style="width: 100%"
                               @visible-change="(v) => { if (v) openDialog($index) }">
                      <el-option v-if="row.model"
                                 :label="row.model"
                                 :value="row.model" />
                    </el-select>
                  </el-form-item>
                </template>
              </el-table-column>
              <el-table-column prop="processId"
                               label="消耗工序"
                               width="150">

 src/views/productionManagement/productStructure/index.vue

@@ -77,15 +77,15 @@

    minWidth: 160
  },
  {
    label: "产品图纸编号",
    prop: "drawingNumber",
    minWidth: 160
  },
    {
        label: "图纸编号",
        prop: "productModelName",
        minWidth: 140
    },
  {
    label: "规格型号",
    prop: "productModelName",
    minWidth: 140
    prop: "drawingNumber",
    minWidth: 160
  },
  {
    label: "版本号",

 src/views/productionManagement/productionCosting/index.vue

@@ -99,12 +99,12 @@
    },
    {
        label: "产品图纸编号",
        prop: "drawingNumber",
        prop: "productModelName",
    minWidth: 100,
    },
    {
        label: "规格型号",
        prop: "productModelName",
        prop: "drawingNumber",
    minWidth: 100,
    },
    {

 src/views/productionManagement/productionOrder/New.vue

@@ -22,21 +22,18 @@
            {{ formState.productName ? formState.productName : '选择产品' }}
          </el-button>
        </el-form-item>

                <el-form-item
                    label="图纸编号"
                    prop="productModelName"
                >
                    <el-input v-model="formState.productModelName"  disabled />
                </el-form-item>
        <el-form-item
            label="图纸编号"
            label="规格型号"
            prop="drawingNumber"
        >
          <el-input v-model="formState.drawingNumber"  disabled />
        </el-form-item>

        <el-form-item
            label="规格"
            prop="productModelName"
        >
          <el-input v-model="formState.productModelName"  disabled />
        </el-form-item>

        <el-form-item
            label="单位"
            prop="unit"

 src/views/productionManagement/productionOrder/index.vue

@@ -141,12 +141,12 @@
    },
    {
      label: "图纸编号",
      prop: "drawingNumber",
      prop: "specificationModel",
      width: '160px',
    },
    {
      label: "规格",
      prop: "specificationModel",
      label: "规格型号",
      prop: "drawingNumber",
      width: '120px',
    },
    {

 src/views/productionManagement/productionReporting/Input.vue

@@ -64,11 +64,11 @@
  },
  {
    label: '投入产品图纸编号',
    prop: 'drawingNumber',
    prop: 'model'
  },
  {
    label: '投入产品型号',
    prop: 'model',
    prop: 'drawingNumber',
  },
  {
    label: '投入数量',

 src/views/productionManagement/productionReporting/index.vue

@@ -179,12 +179,12 @@
    },
    {
      label: "产品图纸编号",
      prop: "drawingNumber",
      prop: "productModelName"
      width: 160,
    },
    {
      label: "产品规格型号",
      prop: "productModelName",
      prop: "drawingNumber",
      width: 120,
    },
    {

 src/views/productionManagement/workOrder/index.vue

@@ -252,11 +252,11 @@
    },
    {
      label: "图纸编号",
      prop: "drawingNumber",
      prop: "model"
    },
    {
      label: "规格",
      prop: "model",
      label: "规格型号",
      prop: "drawingNumber",
    },
    {
      label: "单位",