Merge branch 'master' of http://111.30.93.211:10101/r/supipe

李旭东

2023-11-03 a07b4b6ff1c98dcf81338bb45d59308db7c058a9

 web/src/views/Basics/MouldIndex.vue

@@ -125,8 +125,8 @@
        <el-form-item label="模具型号：" prop="mouldCode">
          <el-input v-model="formMould.mouldCode" :size="size" clearable placeholder="请输入模具型号"></el-input>
        </el-form-item>
        <el-form-item label="模具编号：" prop="mouldNum" v-if="!asyncTitle">
          <el-input v-model="formMould.mouldNum" :disabled="true" clearable placeholder="请输入模具编号"></el-input>
        <el-form-item label="模具编号：" prop="mouldMn">
          <el-input v-model="formMould.mouldMn"  clearable placeholder="请输入模具编号"></el-input>
        </el-form-item>
        <!-- <el-form-item label="模具MN号：" prop="mouldMn">
          <el-input v-model="formMould.mouldMn" :size="size" clearable placeholder="请输入模具MN号"></el-input>
@@ -192,10 +192,10 @@
        </el-select>
        </el-form-item>
        <el-form-item label="模具检查预警值：" prop="supplierId">
          <el-input placeholder="请输入次数" v-model="formMould.input2" style="margin-right:15px">
          <el-input placeholder="请输入次数" v-model="formMould.alarmTimes" style="margin-right:15px">
            <template slot="append">次数</template>
          </el-input>
          <el-input placeholder="请输入天数" v-model="formMould.input2">
          <el-input placeholder="请输入天数" v-model="formMould.alarmDays">
            <template slot="append">天数</template>
          </el-input>
        </el-form-item>
@@ -212,7 +212,7 @@
        <el-form-item label="最大循环次数：" prop="maxCycleTime">
          <el-input v-model="formMould.maxCycleTime" :size="size" clearable placeholder="请输入最大循环次数"></el-input>
        </el-form-item>
        <el-form-item label="生产日期：">
        <el-form-item label="生产日期：" prop="productDate">
          <el-date-picker 
            v-model="formMould.productDate" 
            type="date"
@@ -222,7 +222,7 @@
            placeholder="请选择生产日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="进厂日期：">
        <el-form-item label="进厂日期：" prop="comeFactoryTime">
          <el-date-picker 
            v-model="formMould.comeFactoryTime" 
            type="date"
@@ -336,7 +336,17 @@
            required: true,
            message: '请输入最大循环次数',
            trigger: 'blur'
          }]
          }],
          productDate: [{
            required: true,
            message: '请选择生产日期',
            trigger: ['blur', 'change']
          }],
          comeFactoryTime: [{
            required: true,
            message: '请选择进厂日期',
            trigger: ['blur', 'change']
          }],
        }, // 表单校验规则
        mouldTypeDatas: [], // 块号
        mouldSizeData: [], // 尺寸