Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS

haoxuan

2023-09-22 c054059c05608b1c7235e18b3da0dfa095ebfe4d

 src/views/overview/AddOverviewDialog.vue

@@ -160,7 +160,7 @@
                <div class="purchase-view">
                  <div class="left">
                    <div class="second-label">其他信息</div>
                    <el-form-item v-if="workType !== 1" label="送货策略" prop="client_name">
                    <!-- <el-form-item v-if="workType !== 1" label="送货策略" prop="client_name">
                      <el-select
                        v-model="editConfig.infomation.memberId"
                        placeholder="请选择"
@@ -171,7 +171,7 @@
                        <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                        </el-option>
                      </el-select>
                    </el-form-item>
                    </el-form-item> -->
                    <el-form-item label="负责人" prop="contacterName">
                      <el-select
                        v-model="editConfig.infomation.contacterName"
@@ -364,13 +364,13 @@
        this.showEdit = false
        this.showFooter = true
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === "完成") {
      } else if (this.editConfig.infomation.status === 4) {
        this.showButton = true
        this.showEdit = false
        this.isDelClick = true
        this.showFooter = false
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === "已取消") {
      } else if (this.editConfig.infomation.status === 5) {
        this.showButton = true
        this.showEdit = false
        this.showFooter = false
@@ -442,15 +442,15 @@
      let contacterID = 0
      let contacterName = ""
      if (this.editConfig.title === "新建") {
        companyID = this.companyObj.length === 0 ? 0 : this.companyObj.value
        companyName = this.companyObj.length === 0 ? 0 : this.companyObj.label
        contacterID = this.contacterObj.length === 0 ? 0 : this.contacterObj.value
        contacterName = this.contacterObj.length === 0 ? 0 : this.contacterObj.label
        companyID = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value
        companyName = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.label
        contacterID = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.value
        contacterName = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.label
      } else {
        companyID = this.companyObj.length === 0 ? data.companyID : this.companyObj.value
        companyName = this.companyObj.length === 0 ? data.companyName : this.companyObj.label
        contacterID = this.contacterObj.length === 0 ? data.contacterID : this.contacterObj.value
        contacterName = this.contacterObj.length === 0 ? data.contacterName : this.contacterObj.label
        companyID = Object.keys(this.companyObj).length === 0 ? data.companyID : this.companyObj.value
        companyName = Object.keys(this.companyObj).length === 0 ? data.companyName : this.companyObj.label
        contacterID = Object.keys(this.contacterObj).length === 0 ? data.contacterID : this.contacterObj.value
        contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
      }
      let params = {
        comment: data.comment || "",
@@ -464,6 +464,7 @@
        number: "",
        operationDate: data.operationDate || "",
        operationTypeId: this.editConfig.operationTypeId,
        operationTypeName: this.receiptType,
        sourceNumber: data.sourceNumber || "",
        status: 3,
        toLocationId: data.toLocationId || 0