Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/operate/scrap/AddScrapDialog.vue

@@ -45,22 +45,16 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="产品" prop="productName">
                  <el-select
                    v-model="editConfig.infomation.productName"
                    placeholder="请选择"
                    size="mini"
                    style="width: 90%"
                  <SimpleSearchInput
                    :echoValue="editConfig.infomation.productName"
                    :echoName="editConfig.infomation.productName"
                    checkedNum="1"
                    :clearable="true"
                    @select-user="selProductChange"
                    :disabled="!showFooter"
                    @change="selProductChange"
                    style="width: 90%"
                  >
                    <el-option
                      v-for="item in productOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name, unit: item.unit }"
                    >
                    </el-option>
                  </el-select>
                  </SimpleSearchInput>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -85,7 +79,7 @@
                    :min="0"
                    :precision="2"
                    :controls="false"
                    style="width: 85%"
                    style="width: 90%"
                    :disabled="!showFooter"
                  ></el-input-number>
                  <span>{{ " " + unit }}</span>
@@ -131,7 +125,8 @@
<script>
import { getProductList } from "@/api/product/product"
import { getLocationList } from "@/api/overview/overview"
import { addDisuse, finishDisuse } from "@/api/operate/scrap"
import { addDisuse, finishDisuse, updateScrap } from "@/api/operate/scrap"
import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
export default {
  name: "AddScrapDialog",
  props: {
@@ -146,7 +141,7 @@
      }
    }
  },
  components: {},
  components: { SimpleSearchInput },
  computed: {},
  data() {
    return {
@@ -154,7 +149,7 @@
      editConfig: this.editCommonConfig,
      rules: {
        // 产品，数量必填
        productName: [{ required: true, message: "请选择产品", trigger: "change" }],
        productName: [{ required: true, validator: this.validatorProduct, trigger: "change" }],
        amount: [{ required: true, message: "请输入数量", trigger: "blur" }],
        fromLocationId: [{ required: true, message: "请选择源位置", trigger: "change" }],
        toLocationId: [{ required: true, message: "请选择报废位置", trigger: "change" }],
@@ -173,7 +168,7 @@
      currentState: "todo", // 当前状态
      unit: "",
      showButton: true,
      isValidateClick: false // 验证是否显示
      isValidateClick: false, // 验证是否显示
    }
  },
  created() {
@@ -212,7 +207,7 @@
    },
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建"||this.editConfig.title==="编辑") {
      if (this.editConfig.title === "新建" || this.editConfig.title === "编辑") {
        this.showButton = false
        this.showEdit = false
        this.showFooter = true
@@ -251,32 +246,63 @@
    },
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          this.editConfig.infomation.productId = this.productId
          this.editConfig.infomation.productName = this.productName
          this.editConfig.infomation.unit = this.unit
          addDisuse({
            ...this.editConfig.infomation
          }).then((res) => {
            console.log(res)
            this.editConfig.visible = false
            if (res.code === 200) {
              this.$message.success("添加成功")
              this.$parent.getData()
      if (this.editCommonConfig.title === "新建") {
        this.$refs[formName].validate((valid) => {
          if (valid) {
            this.editConfig.infomation.productId = this.productId
            this.editConfig.infomation.productName = this.productName
            this.editConfig.infomation.unit = this.unit
            addDisuse({
              ...this.editConfig.infomation
            }).then((res) => {
              console.log(res)
              this.editConfig.visible = false
              if (res.code === 200) {
                this.$message.success("添加成功")
                this.$parent.getData()
              }
            })
          }
        })
      } else if (this.editCommonConfig.title === "编辑") {
        this.$refs[formName].validate((valid) => {
          if (valid) {
            let params={
              amount: this.editConfig.infomation.amount,
              baseOperationType: this.editConfig.infomation.baseOperationType,
              fromLocationId: this.editConfig.infomation.fromLocationId,
              id: this.editConfig.infomation.id,
              number: this.editConfig.infomation.number,
              operationDate: this.editConfig.infomation.operationDate,
              productId: this.editConfig.infomation.productId,
              sourceNumber: this.editConfig.infomation.sourceNumber,
              status: this.editConfig.infomation.status,
              toLocationId: this.editConfig.infomation.toLocationId
            }
          })
        }
      })
            updateScrap(
              params
            ).then((res) => {
              console.log(res)
              this.editConfig.visible = false
              if (res.code === 200) {
                this.$message.success("修改成功")
                this.$parent.getData()
              }
            })
          }
        })
      }
    },
    // 选择产品
    selProductChange(val) {
      this.unit = val.unit
      this.productName = val.label
      this.productId = val.value
      this.productName = val.name
      this.productId = val.id
      this.editConfig.infomation.productName = val.name
    },
    // 验证
    async validateClick() {
      console.log(this.editConfig.infomation.id, "xxx")
      await finishDisuse(this.editConfig.infomation.id).then((res) => {
        console.log(res)
        this.editConfig.visible = false
@@ -285,6 +311,14 @@
          this.$parent.getData()
        }
      })
    },
    // 产品单独校验
    validatorProduct(rule, value, callback) {
      if (this.editConfig.infomation.productName && this.editConfig.infomation.productName.length > 0) {
        callback()
      } else {
        callback(new Error("请选择产品"))
      }
    }
  }
}