新疆马铃薯 1.设备台账添加是否为物联设备和外联编码字段、删除设备品牌字段

gaoluyang

9 小时以前 6de6e76034d1fafd98fc64c8c94eb4cb306b2a70

 src/views/equipmentManagement/ledger/Form.vue

@@ -27,11 +27,11 @@
          <el-input v-model="form.deviceModel" placeholder="请输入规格型号" />
        </el-form-item>
      </el-col>
      <el-col :span="12">
      <!-- <el-col :span="12">
        <el-form-item label="设备品牌" prop="deviceBrand">
          <el-input v-model="form.deviceBrand" placeholder="请输入设备品牌" />
        </el-form-item>
      </el-col>
      </el-col> -->
      <el-col :span="12">
        <el-form-item label="设备类型" prop="type">
          <el-select
@@ -93,57 +93,57 @@
          />
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="含税单价" prop="taxIncludingPriceUnit">
          <el-input-number :step="0.01" :min="0" style="width: 100%"
            v-model="form.taxIncludingPriceUnit"
            placeholder="请输入含税单价"
            maxlength="10"
            @change="mathNum"
          />
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="含税总价" prop="taxIncludingPriceTotal">
          <el-input
            v-model="form.taxIncludingPriceTotal"
            placeholder="自动生成"
            type="number"
            disabled
          />
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="税率(%)" prop="taxRate">
          <!-- <el-input
            v-model="form.taxRate"
            placeholder="请输入税率"
            type="number"
          >
            <template #append> % </template>
          </el-input> -->
          <el-select
            v-model="form.taxRate"
            placeholder="请选择"
            clearable
            @change="mathNum"
          >
            <el-option label="1" :value="1" />
            <el-option label="6" :value="6" />
            <el-option label="13" :value="13" />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="不含税总价" prop="unTaxIncludingPriceTotal">
          <el-input
            v-model="form.unTaxIncludingPriceTotal"
            placeholder="自动生成"
            type="number"
            disabled
          />
        </el-form-item>
      </el-col>
<!--      <el-col :span="12">-->
<!--        <el-form-item label="含税单价" prop="taxIncludingPriceUnit">-->
<!--          <el-input-number :step="0.01" :min="0" style="width: 100%"-->
<!--            v-model="form.taxIncludingPriceUnit"-->
<!--            placeholder="请输入含税单价"-->
<!--            maxlength="10"-->
<!--            @change="mathNum"-->
<!--          />-->
<!--        </el-form-item>-->
<!--      </el-col>-->
<!--      <el-col :span="12">-->
<!--        <el-form-item label="含税总价" prop="taxIncludingPriceTotal">-->
<!--          <el-input-->
<!--            v-model="form.taxIncludingPriceTotal"-->
<!--            placeholder="自动生成"-->
<!--            type="number"-->
<!--            disabled-->
<!--          />-->
<!--        </el-form-item>-->
<!--      </el-col>-->
<!--      <el-col :span="12">-->
<!--        <el-form-item label="税率(%)" prop="taxRate">-->
<!--          &lt;!&ndash; <el-input-->
<!--            v-model="form.taxRate"-->
<!--            placeholder="请输入税率"-->
<!--            type="number"-->
<!--          >-->
<!--            <template #append> % </template>-->
<!--          </el-input> &ndash;&gt;-->
<!--          <el-select-->
<!--            v-model="form.taxRate"-->
<!--            placeholder="请选择"-->
<!--            clearable-->
<!--            @change="mathNum"-->
<!--          >-->
<!--            <el-option label="1" :value="1" />-->
<!--            <el-option label="6" :value="6" />-->
<!--            <el-option label="13" :value="13" />-->
<!--          </el-select>-->
<!--        </el-form-item>-->
<!--      </el-col>-->
<!--      <el-col :span="12">-->
<!--        <el-form-item label="不含税总价" prop="unTaxIncludingPriceTotal">-->
<!--          <el-input-->
<!--            v-model="form.unTaxIncludingPriceTotal"-->
<!--            placeholder="自动生成"-->
<!--            type="number"-->
<!--            disabled-->
<!--          />-->
<!--        </el-form-item>-->
<!--      </el-col>-->
      <!-- <el-col :span="12">
        <el-form-item label="录入人" prop="createUser">
          <el-input v-model="form.createUser" placeholder="请输入录入人" />
@@ -173,6 +173,16 @@
                  placeholder="请选择录入日期"
                  clearable
               />
            </el-form-item>
         </el-col>
         <el-col :span="12">
            <el-form-item label="物联设备" prop="isIotDevice">
               <el-switch v-model="form.isIotDevice" :active-value="1" :inactive-value="0" />
            </el-form-item>
         </el-col>
         <el-col :span="12" v-if="form.isIotDevice === 1">
            <el-form-item label="外部编码" prop="externalCode">
               <el-input v-model="form.externalCode" placeholder="请输入外部编码" />
            </el-form-item>
         </el-col>
    </el-row>
@@ -233,13 +243,25 @@
         trigger: "blur" 
      }
   ],
   externalCode: [
      { 
         validator: (rule, value, callback) => {
            if (form.isIotDevice === 1 && !value) {
               callback(new Error('物联设备为是时，请输入外部编码'));
            } else {
               callback();
            }
         }, 
         trigger: "blur" 
      }
   ],
}

const { form, resetForm } = useFormData({
  areaId: undefined, // 区域ID
  deviceName: undefined, // 设备名称
  deviceModel: undefined, // 规格型号
  deviceBrand: undefined, // 设备品牌
  // deviceBrand: undefined, // 设备品牌
  type: undefined, // 设备类型
  supplierName: undefined, // 供应商
  storageLocation: undefined, // 存放位置
@@ -253,7 +275,9 @@
  unTaxIncludingPriceTotal: undefined, // 不含税总价
  // createUser: useUserStore().nickName, // 录入人
  createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 录入日期
   planRuntimeTime: dayjs().format("YYYY-MM-DD"), // 录入日期
  planRuntimeTime: dayjs().format("YYYY-MM-DD"), // 预计运行时间
  isIotDevice: 0, // 是否为物联设备 0-否 1-是
  externalCode: undefined, // 外部编码
});

const loadForm = async (id) => {
@@ -265,7 +289,7 @@
    form.areaId = data.areaId;
    form.deviceName = data.deviceName;
    form.deviceModel = data.deviceModel;
    form.deviceBrand = data.deviceBrand;
    // form.deviceBrand = data.deviceBrand;
    form.type = data.type;
    form.supplierName = data.supplierName;
    form.storageLocation = data.storageLocation;
@@ -284,6 +308,9 @@
    } else {
      form.planRuntimeTime = undefined;
    }
    // 物联设备和外部编码
    form.isIotDevice = data.isIotDevice ?? 0;
    form.externalCode = data.externalCode;
  }
};