zouyu
2023-12-19 e75fbafe30f3acfafa5cc9425ddca1eb1221ae45
Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
已修改4个文件
14 ■■■■ 文件已修改
src/views/basic/location/location-form.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/part/part-form.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/technology/routing/routing-form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/technology/structure/single-structure-form.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/location/location-form.vue
@@ -31,14 +31,14 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="父节点类型" prop="pType">
            <el-input
              v-model="dataForm.pType"
              placeholder="父节点类型"
            ></el-input>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
        <el-col :span="12">
src/views/basic/part/part-form.vue
@@ -31,6 +31,7 @@
        </el-col>
        <el-col :span="12">
          <el-form-item label="名称" prop="partName">
            <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
            <el-input
              v-model="dataForm.partName"
              placeholder="零件名称"
@@ -42,6 +43,7 @@
                @click="openPartDialog()"
              ></el-button> -->
            </el-input>
            </el-tooltip>
          </el-form-item>
        </el-col>
      </el-row>
@@ -362,10 +364,12 @@
      <el-row>
        <el-col :span="12">
          <el-form-item label="备注" prop="description">
            <el-tooltip class="item" effect="dark" :content="dataForm.description" >
            <el-input
              v-model="dataForm.description"
              placeholder="备注"
            ></el-input>
            </el-tooltip>
          </el-form-item>
        </el-col>
      </el-row>
src/views/technology/routing/routing-form.vue
@@ -701,7 +701,7 @@
      dataRule: {
        partNo: [
          { required: true, message: '零件不能为空', trigger: 'blur' }
        ],
        ],
        bomTypeDb: [
          { required: true, message: '工艺类型不能为空', trigger: 'change' }
        ],
src/views/technology/structure/single-structure-form.vue
@@ -39,13 +39,15 @@
                </el-input>
              </el-form-item>
              <el-form-item label="零件名称" prop="partName">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input
                  v-model="dataForm.partName"
                  placeholder="零件名称"
                  style="width: 150px"
                  style="width: 100%"
                  :readonly="true"
                >
                </el-input>
                </el-tooltip>
              </el-form-item>
              <el-form-item label="备注" prop="remark">
                <el-input