spring
7 天以前 5fffe75d01be84ad2de0b097f41428698384e218
fix: 入库单位可选择
已修改5个文件
125 ■■■■■ 文件已修改
src/views/basicData/product/index.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/dispatchLog/Record.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/Record.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/New.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/Subtract.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/index.vue
@@ -153,12 +153,15 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="单位:" prop="unit">
              <el-input
              <el-select
                v-model="modelForm.unit"
                placeholder="请输入单位"
                placeholder="请选择单位"
                clearable
                @keydown.enter.prevent
              />
                style="width: 100%"
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
src/views/inventoryManagement/dispatchLog/Record.vue
@@ -82,17 +82,17 @@
                    show-overflow-tooltip
                />
                <el-table-column
                    label="毛重(吨)"
                    label="毛重"
                    prop="grossWeight"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="皮重(吨)"
                    label="皮重"
                    prop="tareWeight"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="净重(吨)"
                    label="净重"
                    prop="netWeight"
                    show-overflow-tooltip
                />
@@ -159,6 +159,8 @@
            />
          </el-form-item> -->
          <el-form-item
            label="车牌号"
            prop="licensePlateNo"
@@ -166,9 +168,22 @@
          >
            <el-input v-model="editForm.licensePlateNo" />
          </el-form-item>
          <el-form-item
            label="毛重(吨)"
            label="单位"
            prop="unit"
          >
            <el-select
              v-model="editForm.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
            >
              <el-option label="吨" value="吨" />
              <el-option label="公斤" value="公斤" />
            </el-select>
          </el-form-item>
          <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
          >
@@ -182,7 +197,7 @@
          </el-form-item>
          <el-form-item
            label="皮重(吨)"
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
          >
@@ -196,7 +211,7 @@
          </el-form-item>
          <el-form-item
            label="净重(吨)"
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
          >
src/views/inventoryManagement/receiptManagement/Record.vue
@@ -82,15 +82,15 @@
                         prop="licensePlateNo"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="毛重(吨)"
        <el-table-column label="毛重"
                         prop="grossWeight"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="皮重(吨)"
        <el-table-column label="皮重"
                         prop="tareWeight"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="净重(吨)"
        <el-table-column label="净重"
                         prop="netWeight"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
@@ -151,6 +151,8 @@
          </el-form-item> -->
          <template v-if="type === '0'">
            <el-form-item
              label="车牌号"
              prop="licensePlateNo"
@@ -158,9 +160,22 @@
            >
              <el-input v-model="editForm.licensePlateNo" />
            </el-form-item>
            <el-form-item
              label="毛重(吨)"
              label="单位"
              prop="unit"
            >
              <el-select
                v-model="editForm.unit"
                placeholder="请选择单位"
                style="width: 100%"
                clearable
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
              </el-select>
            </el-form-item>
            <el-form-item
              label="毛重"
              prop="grossWeight"
              :rules="[{ required: true, message: '请输入毛重', trigger: ['blur', 'change'] }]"
            >
@@ -174,7 +189,7 @@
            </el-form-item>
            <el-form-item
              label="皮重(吨)"
              label="皮重"
              prop="tareWeight"
              :rules="[{ required: true, message: '请输入皮重', trigger: ['blur', 'change'] }]"
            >
@@ -188,7 +203,7 @@
            </el-form-item>
            <el-form-item
              label="净重(吨)"
              label="净重"
              prop="netWeight"
              :rules="[{ required: true, message: '请输入净重', trigger: ['blur', 'change'] }]"
            >
src/views/inventoryManagement/stockManagement/New.vue
@@ -30,12 +30,7 @@
          <el-input v-model="formState.productModelName"  disabled />
        </el-form-item>
        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>
        <!-- 半成品:允许手动填写数量入库 -->
        <el-form-item
@@ -66,10 +61,23 @@
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>
        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-select
              v-model="formState.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
          >
            <el-option label="吨" value="吨" />
            <el-option label="公斤" value="公斤" />
          </el-select>
        </el-form-item>
        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="毛重(吨)"
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
        >
@@ -84,7 +92,7 @@
        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="皮重(吨)"
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
        >
@@ -99,7 +107,7 @@
        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="净重(吨)"
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '请先输入毛重和皮重自动计算净重', trigger: ['blur','change'] }]"
        >
src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -31,22 +31,28 @@
        </el-form-item>
        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>
        <el-form-item
            label="车牌号"
            prop="licensePlateNo"
            :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>
        <el-form-item
            label="毛重(吨)"
            label="单位"
            prop="unit"
        >
          <el-select
              v-model="formState.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
          >
            <el-option label="吨" value="吨" />
            <el-option label="公斤" value="公斤" />
          </el-select>
        </el-form-item>
        <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
        >
@@ -60,7 +66,7 @@
        </el-form-item>
        <el-form-item
            label="皮重(吨)"
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
        >
@@ -74,7 +80,7 @@
        </el-form-item>
        <el-form-item
            label="净重(吨)"
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
        >