Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/views/service/serviceContract/AddServiceContractDialog.vue

@@ -39,8 +39,12 @@
                    <div class="common-select-btn" @click="selClientClick('client')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('client')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('client')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
@@ -64,7 +68,7 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="联系人姓名" prop="contactId">
                <el-form-item label="联系人姓名" prop="contact_name">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.contact_name"
@@ -79,14 +83,18 @@
                    <div class="common-select-btn" @click="selClientClick('contact')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('contact')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('contact')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售机会" prop="saleChanceId">
                <el-form-item label="销售机会" prop="sale_chance_name">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.sale_chance_name"
@@ -101,14 +109,18 @@
                    <div class="common-select-btn" @click="selClientClick('chance')">
                      <i class="el-icon-circle-plus-outline"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('chance')">
                      <i class="el-icon-edit-outline"></i>
                    <div
                      v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('chance')"
                    >
                      <i class="el-icon-remove-outline"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同订单" prop="contractId">
                <el-form-item label="合同订单" prop="contract_number">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.contract_number"
@@ -123,14 +135,18 @@
                    <div class="common-select-btn" @click="selClientClick('contract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('contract')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.contract_number && editConfig.infomation.contract_number.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('contract')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="报价单" prop="quotationId">
                <el-form-item label="报价单" prop="quotation_number">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.quotation_number"
@@ -145,17 +161,21 @@
                    <div class="common-select-btn" @click="selClientClick('quotation')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('quotation')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.quotation_number && editConfig.infomation.quotation_number.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('quotation')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同类型" prop="typeId">
                <el-form-item label="合同类型" prop="serviceContractTypeId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.typeId"
                      v-model="editConfig.infomation.serviceContractTypeId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -207,10 +227,10 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="合同状态" prop="statusId">
                <el-form-item label="合同状态" prop="serviceContractStatusId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.statusId"
                      v-model="editConfig.infomation.serviceContractStatusId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -229,7 +249,14 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="应服务次数" prop="serviceTimes">
                  <el-input v-model="editConfig.infomation.serviceTimes"></el-input>
                  <el-input-number
                    v-model="editConfig.infomation.serviceTimes"
                    placeholder="请输入"
                    :min="0"
                    :precision="2"
                    :controls="false"
                    style="width: 100%; margin-right: 5px"
                  ></el-input-number>
                </el-form-item>
              </el-col>
            </el-row>
@@ -312,6 +339,7 @@
              @addProductClick="addProductClick"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
              @clearupProduct="clearupProduct"
            />
          </div>
          <!-- 选择审批流程 -->
@@ -452,7 +480,7 @@
        show: true,
        total: true,
        sumProp: ["Amount", "Unit", "total"],
        mergeNumber: 3
        mergeNumber: 2
      },
      editSelectClientConfig: {
        editVisible: false,
@@ -480,7 +508,8 @@
      contractId: this.editCommonConfig.infomation.salesDetailsId,
      quotationId: this.editCommonConfig.infomation.quotationId,
      tableData: [],
      productId: 1
      productId: 1,
      isNoProduct: true
    }
  },
  created() {
@@ -512,26 +541,38 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          console.log(this.editConfig.infomation)
          const params = this.saveParams()
          console.log(params)
          if (this.editConfig.title === "新建") {
            getAddServiceContract(params).then((res) => {
              console.log(res)
              this.editConfig.visible = false
              if (res.code === 200) {
                this.$message.success("添加成功")
                this.$parent.getData()
              }
            })
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].name.length === 0) {
              this.isNoProduct = true
              break
            } else {
              this.isNoProduct = false
            }
          }
          if (this.isNoProduct) {
            this.$message.error("产品名称不能为空")
          } else {
            getUpdateServiceContract(params).then((res) => {
              console.log(res)
              this.editConfig.visible = false
              if (res.code === 200) {
                this.$message.success("编辑成功")
                this.$parent.getData()
              }
            })
            const params = this.saveParams()
            console.log(params)
            if (this.editConfig.title === "新建") {
              getAddServiceContract(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message.success("添加成功")
                  this.$parent.getData()
                }
              })
            } else {
              getUpdateServiceContract(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message.success("编辑成功")
                  this.$parent.getData()
                }
              })
            }
          }
        } else {
          console.log("error submit")
@@ -548,17 +589,7 @@
        endTime: data.endTime || "",
        memberId: data.memberId || 0,
        number: data.number || "",
        products: [
          {
            amount: 0,
            desc: "",
            id: 0,
            name: "",
            number: "",
            price: 0,
            total: 0
          }
        ],
        products: this.tableData,
        quotationId: this.quotationId || 0,
        remark: data.remark || "",
        saleChanceId: this.saleChanceId || 0,
@@ -566,9 +597,11 @@
        serviceTimes: data.serviceTimes || 0,
        signTime: data.signTime || "",
        startTime: data.startTime || "",
        statusId: data.statusId || 0,
        statusId: 0,
        terms: data.terms || "",
        typeId: data.typeId || 0
        typeId: 0,
        serviceContractTypeId: data.serviceContractTypeId || 0,
        serviceContractStatusId: data.serviceContractStatusId || 0
      }
      return params
    },
@@ -673,88 +706,84 @@
    // 设置允许上传文件格式
    setFormatClick() {},
    setTableForm() {
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title === "新建" || this.editConfig.infomation.products.length === 0) {
        this.tableData = [
          {
            id: 1,
            Amount: 0,
            IsSale: true,
            MaterialMode: "",
            MinInventory: 0,
            Name: "",
            Number: "",
            PurchaseType: "",
            SalePrice: 0,
            Unit: ""
            productId: this.productId,
            id: 0,
            amount: 0,
            desc: "",
            name: "",
            number: "",
            price: 0,
            total: 0
          }
        ]
      } else {
        this.tableData = this.editConfig.infomation.products
        this.tableData.map((item, index) => {
          item.productId = index + 1
        })
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "#", prop: "id", width: 40 },
          { label: "产品名称", prop: "Name", input: true, isRequird: true },
          { label: "产品编号", prop: "Number" },
          { label: "服务开始日", prop: "other5", date: true, isRequird: true, min: 100 },
          { label: "服务到期日", prop: "other6", date: true, isRequird: true, min: 100 },
          { label: "数量", prop: "Amount", input: true, isRequird: true },
          { label: "销售单价", prop: "Unit", input: true },
          { label: "价税合计", prop: "total", input: true },
          { label: "描述", prop: "other8" }
          { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, isRequird: true },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "销售单价", prop: "price", inputFloat: true },
          { label: "价税合计", prop: "total", inputFloat: true }
        ]
      }
    },
    // 产品列表输入
    inputContent(val, prop, row) {
      console.log("aaaaaaaa")
      console.log(val, prop)
      this.productId = row.id
      this.productId = row.productId
      this.tableData.map((item) => {
        if (item.id === row.id) {
        if (item.productId === row.productId) {
          item[prop] = val
        }
      })
      console.log(this.tableData)
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        id: this.productId,
        Amount: 0,
        IsSale: true,
        MaterialMode: "",
        MinInventory: 0,
        Name: "",
        Number: "",
        PurchaseType: "",
        SalePrice: 0,
        Unit: ""
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0
      })
      this.showSummary.show = true
    },
    //  产品清空
    emptyProductClick() {
      this.productId = 1
      this.tableData = [
        {
          id: 1,
          Amount: 0,
          IsSale: true,
          MaterialMode: "",
          MinInventory: 0,
          Name: "",
          Number: "",
          PurchaseType: "",
          SalePrice: 0,
          Unit: ""
          productId: this.productId,
          id: 0,
          amount: 0,
          desc: "",
          name: "",
          number: "",
          price: 0,
          total: 0
        }
      ]
      this.productTableList.tableData = this.tableData
    },
    // 产品重算
    recalculateProductClick() {}
    recalculateProductClick() {},
    clearupProduct(data) {
      this.tableData = data
      this.productTableList.tableData = this.tableData
    }
  }
}
</script>
@@ -809,6 +838,9 @@
      height: 55px;
      line-height: 55px;
    }
    .el-input__inner {
      text-align: left;
    }
  }
}
</style>