Merge branch 'master' of ssh://123.56.95.229:29418/高精

src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue

@@ -133,10 +133,10 @@
 
     <el-dialog :visible.sync="dialogFormVisible" title="转为滞货" center width="380px">
       <span>转为滞货数量：</span>
-      <el-input-number :min="0" :max="maxNumber" v-model="number" controls-position="right"/>
+      <el-input-number :min="1" :max="maxNumber" v-model="number" controls-position="right"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible=false">取消</el-button>
-        <el-button :disabled="Number(number)===0" type="primary" @click="submitTurn()">确定</el-button>
+        <el-button :disabled="turnToBacklogGoods_diaable" type="primary" @click="submitTurn()">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -149,6 +149,7 @@ export default {
   name: 'BacklogGoodsAnalysis',
   data() {
     return {
+      turnToBacklogGoods_diaable: false,
       materialName: '',
       materialSpec: '',
       materialModel: '',
@@ -200,13 +201,15 @@ export default {
     },
     turnToBacklogGoods(row) {
       this.number = 0
-      this.dialogFormVisible = true
+      this.turnToBacklogGoods_diaable = false
       this.maxNumber = row.可转滞货数量
       this.materialNum = row.物料流水号
       this.materialLocalNum = row.物料与货位对照流水号
       this.localNum = row.货位流水号
+      this.dialogFormVisible = true
     },
     submitTurn() {
+      this.turnToBacklogGoods_diaable = true
       submitTurn(this.materialNum, this.number, this.materialLocalNum, this.localNum).then(response => {
         if (response.data[0].result === '1') {
           this.searchTable1()

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -80,7 +80,7 @@
               <el-tooltip :open-delay="100" effect="dark" content="开启物料变更" placement="top">
                 <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
               </el-tooltip>
-              <el-button type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
+              <el-button :disabled="tiaozheng1_disable" type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
               <el-select v-model="PersonValue" style="width:100px;float: right;" placeholder="人员" size="small" filterable clearable>
                 <el-option
                   v-for="item in Person"
@@ -969,6 +969,7 @@
         <el-button size="small" icon="el-icon-circle-close" @click="dialogVisible2=false">取消</el-button>
         <el-button
           v-show="title2==='创建询价单'"
+          :disabled="createInquirySheet_disable"
           type="distribution"
           size="small"
           icon="el-icon-circle-check"
@@ -1125,6 +1126,8 @@ export default {
   name: '', // 创建询价单
   data() {
     return {
+      tiaozheng1_disable: false,
+      createInquirySheet_disable: false,
       startTime: '',
       endTime: '',
       loading: false,
@@ -1424,10 +1427,12 @@ export default {
     tiaozheng1() {
       if (this.标准件和外购件流水号.length !== 0) {
         if (this.PersonValue) {
+          this.tiaozheng1_disable = true
           tiaozheng1(this.PersonValue, this.标准件和外购件流水号).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('调整成功')
               this.searchTable11()
+              this.tiaozheng1_disable = false
             } else {
               this.$message.warning('调整失败')
             }
@@ -1989,6 +1994,7 @@ export default {
     submitCreateInquirySheet() { // 提交创建询价单
       this.$refs['form2'].validate((valid) => {
         if (valid) {
+          this.createInquirySheet_disable = true
           const numGroup1 = [] // 空数组，放现有的询价单号
           searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
             for (let i = 0; i < response.data.length; i++) {
@@ -1996,6 +2002,7 @@ export default {
             }
           }).then(() => {
             if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) {
+              this.createInquirySheet_disable = false
               this.$message.error('该询价单号已存在')
             } else {
               createInquirySheet(this.form2.inquirySheetNum, this.id, this.form2.supplierValue, '').then(response => {
@@ -2006,6 +2013,7 @@ export default {
                   this.supplierValue = ''
                   this.dialogVisible2 = false
                   this.searchTable2()
+                  this.createInquirySheet_disable = false
                 } else { this.$message.error('操作失败') }
               })
             }
@@ -2019,6 +2027,7 @@ export default {
     submitCreateInquirySheet1() { // 提交创建询价单
       this.$refs['form2'].validate((valid) => {
         if (valid) {
+          this.createInquirySheet_disable = true
           createInquirySheet(this.form2.inquirySheetNum, this.id, this.form2.supplierNameValue, '').then(response => {
             if (!(response.data)) {
               this.$message.success('创建成功')
@@ -2029,7 +2038,11 @@ export default {
               this.dialogVisible2 = false
               this.inquirySheetNum = this.form2.inquirySheetNum
               this.searchTable2(this.inquirySheetNum)
-            } else { this.$message.error('操作失败！该询价单已存在，请重新输入') }
+              this.createInquirySheet_disable = false
+            } else {
+              this.$message.error('操作失败！该询价单已存在，请重新输入')
+              this.createInquirySheet_disable = false
+            }
           })
         }
       })
@@ -2084,6 +2097,7 @@ export default {
     submitEditInquirySheet() { // 提交编辑询价单
       this.$refs['form2'].validate((valid) => {
         if (valid) {
+          this.createInquirySheet_disable = true
           const numGroup1 = [] // 空数组，放现有的询价单号
           const numGroup2 = [] // 空数组，放现有的询价单流水号
           searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
@@ -2094,6 +2108,7 @@ export default {
           }).then(() => {
             if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) {
               this.$message.error('该询价单号已存在')
+              this.createInquirySheet_disable = false
             } else {
               editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierNameValue).then(response => {
                 if (response.data[0].result === '1') {
@@ -2103,7 +2118,11 @@ export default {
                   this.supplierValue = ''
                   this.dialogVisible2 = false
                   this.searchTable2()
-                } else { this.$message.error('修改失败') }
+                  this.createInquirySheet_disable = false
+                } else {
+                  this.$message.error('修改失败')
+                  this.createInquirySheet_disable = false
+                }
               })
             }
           })

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -178,6 +178,7 @@ export default {
   inject: ['reload'],
   data() {
     return {
+      generateContract_disabed: true,
       isShowN: false,
       loading: false,
       openDeal: true,
@@ -856,6 +857,7 @@ export default {
     //   this.content = `自定义`
     // },
     generateContract() { // 生成采购合同
+      this.generateContract_disabed = true
       for (let i = 0; i < this.tableData1.length; i++) {
         if (this.tableData1[i].含税单价 === '') {
           console.log(this.tableData1[i].含税单价, '含税单价')
@@ -863,6 +865,7 @@ export default {
         }
       }
       if (this.count === this.tableData1.length) {
+        this.generateContract_disabed = false
         this.$message.error('该合同未绑定物料信息')
       } else {
         this.content = this.contentNew.replace(/&nbsp;/g, '')
@@ -899,8 +902,10 @@ export default {
                   this.$message.success('合同生成成功')
                   this.openDeal = true
                   this.reload()
+                  this.generateContract_disabed = false
                 } else {
                   this.$message.error('生成合同失败')
+                  this.generateContract_disabed = false
                 }
               })
             }).catch(() => {
@@ -908,11 +913,14 @@ export default {
                 type: 'info',
                 message: '已取消操作'
               })
+              this.generateContract_disabed = false
             })
           } else {
+            this.generateContract_disabed = false
             this.$message.warning('请先选择模板进行预览')
           }
         } else {
+          this.generateContract_disabed = false
           this.$message.warning('请先选择合同进行编辑')
         }
       }

src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue

@@ -278,8 +278,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
-        <el-button v-if="title1 === '到票结算申请'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
-        <el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button>
+        <el-button v-if="title1 === '到票结算申请'" :disabled="submitAdd1_disable" size="small" type="primary" @click="submitAdd1()">确定</el-button>
+        <el-button v-else :disabled="submitAdd1_disable" size="small" type="primary" @click="submitEdit()">确定</el-button>
       </div>
     </el-dialog>
 
@@ -400,6 +400,7 @@ export default {
   name: '', // 发票结算申请
   data() {
     return {
+      submitAdd1_disable: false,
       dateRange: '',
       pickerOptions: {
         shortcuts: [{
@@ -518,6 +519,7 @@ export default {
       this.form1.isCost = ''
       this.form1.remark = ''
       this.title1 = '到票结算申请'
+      this.submitAdd1_disable = false
       this.dialogVisible1 = true
     },
     searchTable1() {
@@ -542,6 +544,7 @@ export default {
     submitAdd1() { // 提交新增
       this.$refs['form1'].validate((valid) => {
         if (valid) {
+          this.submitAdd1_disable = true
           insertInto(this.form1.invoiceNum, this.form1.money, this.form1.supplierValue, this.form1.paid, this.form1.unpaid, this.form1.tax, this.form1.isCost, this.form1.remark).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -26,7 +26,7 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"/>
                 <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
-                <el-button type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
+                <el-button :disabled="tiaozheng1_disable" type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
                 <el-select v-model="PersonValue" style="width:100px; float: right" placeholder="人员" size="small" filterable clearable>
                   <el-option
                     v-for="item in Person"
@@ -586,12 +586,14 @@
       <div slot="footer" class="dialog-footer">
         <el-button
           v-show="title2==='创建离线合同'"
+          :disabled="submitAddOfflineContract_disable"
           type="distribution"
           size="small"
           icon="el-icon-circle-check"
           @click="submitAddOfflineContract">确定</el-button>
         <el-button
           v-show="title2==='编辑离线合同'"
+          :disabled="submitEditOfflineContract_disable"
           type="distribution"
           size="small"
           icon="el-icon-circle-check"
@@ -622,6 +624,9 @@ export default {
   name: '', // 离线合同
   data() {
     return {
+      submitAddOfflineContract_disable: false,
+      submitEditOfflineContract_disable: false,
+      tiaozheng1_disable: false,
       supplierNames: [],
       startTime: '',
       标准件和外购件流水号: [],
@@ -933,12 +938,15 @@ export default {
     tiaozheng1() {
       if (this.标准件和外购件流水号.length !== 0) {
         if (this.PersonValue) {
+          this.tiaozheng1_disable = true
           tiaozheng1(this.PersonValue, this.标准件和外购件流水号).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('调整成功')
               this.searchTable11()
+              this.tiaozheng1_disable = false
             } else {
               this.$message.warning('调整失败')
+              this.tiaozheng1_disable = false
             }
           })
         } else {
@@ -1104,6 +1112,7 @@ export default {
         this.form2.供应商名称 = ''
         this.form2.规定到货时间 = ''
         this.form2.离线合同备注 = '付款方式：；付款时间：；到货时间：；开票信息：；其他说明：；'
+        this.submitAddOfflineContract_disable = false
         this.dialogVisible2 = true
       })
     },
@@ -1117,9 +1126,11 @@ export default {
         }
       })
     },
-    submitAddOfflineContract() { // 新建离线合同
+    // 新建离线合同
+    submitAddOfflineContract() {
       this.$refs['form2'].validate((valid) => {
         if (valid) {
+          this.submitAddOfflineContract_disable = true
           const numGroup1 = [] // 空数组，放现有的询价单号
           searchOfflineContract2().then(response => { // 先查询判断是否存在
             for (let i = 0; i < response.data.length; i++) {
@@ -1131,11 +1142,13 @@ export default {
             } else {
               addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
                 if (response.data[0].result === '1') {
+                  this.dialogVisible2 = false
                   this.$message.success('新建离线合同成功')
                   this.offlineContract = this.form2.离线合同编号
                   this.searchTable2(this.offlineContract)
-                  this.dialogVisible2 = false
-                } else { this.$message.error('新建离线合同失败') }
+                } else {
+                  this.$message.error('新建离线合同失败')
+                }
               })
             }
           })
@@ -1157,11 +1170,13 @@ export default {
       this.form2.供应商名称 = row.供应商名称
       this.form2.规定到货时间 = row.规定到货时间
       this.form2.离线合同备注 = row.离线合同备注
+      this.submitEditOfflineContract_disable = false
       this.dialogVisible2 = true
     },
     submitEditOfflineContract() {
       this.$refs['form2'].validate((valid) => {
         if (valid) {
+          this.submitEditOfflineContract_disable = true
           const numGroup1 = [] // 空数组，放现有的离线合同号
           const numGroup2 = [] // 空数组，放现有的离线合同流水号
           searchOfflineContract2().then(response => { // 先查询判断是否存在
@@ -1175,10 +1190,12 @@ export default {
             } else {
               editOfflineContract(this.form2.离线合同流水号, this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
                 if (response.data[0].result === '1') {
+                  this.dialogVisible2 = false
                   this.$message.success('修改离线合同成功')
                   this.searchTable2()
-                  this.dialogVisible2 = false
-                } else { this.$message.error('修改离线合同失败') }
+                } else {
+                  this.$message.error('修改离线合同失败')
+                }
               })
             }
           })

src/views/PurchasingCenter/OfflineContractRequestFund/index.vue

@@ -247,7 +247,7 @@
         </el-table-column>
       </el-table>
       <span>合计：<el-input v-model="SUM" readonly size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
-      <el-button type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
+      <el-button :disabled="submitRequestFund_disable" type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
       <el-table v-loading="" :data="tableData02" :summary-method="getSummaries" border style="max-height: 500px;" height="500px" size="mini" show-summary>
         <el-table-column label="离线合同编号" align="center" min-width="150">
           <template slot-scope="scope">
@@ -312,6 +312,7 @@ export default {
   name: '', // 离线合同
   data() {
     return {
+      submitRequestFund_disable: false,
       selectContents: '',
       totalSum: 0,
       totalPay: 0,
@@ -501,6 +502,7 @@ export default {
     },
     submitRequestFund() { // 确认请款
       if (this.supplierValue && this.contractGroup.length !== 0) {
+        this.submitRequestFund_disable = true
         this.SUM = 0
         this.contractGroup = []
         this.sumGroup = []
@@ -514,6 +516,7 @@ export default {
           }
         }
         if (this.SUM === 0) {
+          this.submitRequestFund_disable = false
           this.$message.error('请款金额不能为0')
         } else {
           submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
@@ -521,12 +524,15 @@ export default {
               this.$message.success('请款成功')
               this.searchTable1()
               this.dialogVisible2 = false
+              this.submitRequestFund_disable = false
             } else {
+              this.submitRequestFund_disable = false
               this.$message.error('请款失败')
             }
           })
         }
       } else {
+        this.submitRequestFund_disable = false
         this.$message.error('请选择需要请款的合同')
       }
     },

src/views/PurchasingCenter/SupplierManagement/index.vue

@@ -306,8 +306,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-show="title==='新增供应商'" type="primary" @click="submitAdd('form')">确定</el-button>
-        <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
+        <el-button v-show="title==='新增供应商'" :disabled="submitAdd_disable" type="primary" @click="submitAdd('form')">确定</el-button>
+        <el-button v-show="title==='编辑'" :disabled="handleEdit_disable" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -331,8 +331,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-show="title2==='增加'" type="primary" @click="submitAdd2('form2')">确定</el-button>
-        <el-button v-show="title2==='编辑'" type="primary" @click="submitEdit2('form2')">确定</el-button>
+        <el-button v-show="title2==='增加'" :disabled="submitAdd2_disable" type="primary" @click="submitAdd2('form2')">确定</el-button>
+        <el-button v-show="title2==='编辑'" :disabled="submitEdit2_disable" type="primary" @click="submitEdit2('form2')">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -344,6 +344,10 @@ import { searchData, addTable, editTable, deleteData, getName, addPerson, editPe
 export default {
   data() {
     return {
+      handleEdit_disable: false,
+      submitAdd_disable: false,
+      submitAdd2_disable: false,
+      submitEdit2_disable: false,
       loading: false,
       loading2: false,
       mainProduction: '', // 主要产品
@@ -444,7 +448,6 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.dialogFormVisible = true
       this.title = '新增供应商'
       this.form.供应商名称 = ''
       this.form.企业性质 = ''
@@ -459,10 +462,13 @@ export default {
       this.form.传真 = ''
       this.form.货期 = ''
       this.supplierSerialNumber = ''
+      this.submitAdd_disable = false
+      this.dialogFormVisible = true
     },
     submitAdd(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.submitAdd_disable = true
           addTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.form.电话号码, this.form.传真, this.form.货期).then(response => {
             if (Number(response.data.output[0].output1) === 0) {
               this.$message.warning('该供应商已存在')
@@ -481,11 +487,9 @@ export default {
       })
     },
     handleEdit(row) {
-      console.log(row)
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.dialogFormVisible = true
       this.title = '编辑'
       this.form.供应商名称 = row.供应商名称
       this.form.企业性质 = row.企业性质
@@ -500,10 +504,13 @@ export default {
       this.form.传真 = row.传真
       this.form.货期 = row.货期
       this.supplierSerialNumber = row.供应商流水号
+      this.handleEdit_disable = false
+      this.dialogFormVisible = true
     },
     submitEdit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.handleEdit_disable = true
           editTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.supplierSerialNumber, this.form.传真, this.form.货期, this.form.电话号码).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('编辑成功')
@@ -565,17 +572,19 @@ export default {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
-      this.dialogFormVisible2 = true
       this.title2 = '增加'
       this.form2.姓名 = ''
       this.form2.职务 = ''
       this.form2.电话 = ''
       this.form2.手机 = ''
       this.form2.传真 = ''
+      this.submitAdd2_disable = false
+      this.dialogFormVisible2 = true
     },
     submitAdd2(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.submitAdd2_disable = true
           addPerson(this.form2.姓名, this.form2.职务, this.form2.电话, this.form2.手机, this.form2.传真, this.form2.供应商流水号).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
@@ -595,7 +604,6 @@ export default {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
-      this.dialogFormVisible2 = true
       this.title2 = '编辑'
       this.form2.姓名 = row.姓名
       this.form2.职务 = row.职务
@@ -603,10 +611,13 @@ export default {
       this.form2.手机 = row.手机
       this.form2.传真 = row.传真
       this.form2.供应商联系人流水号 = row.供应商联系人流水号
+      this.submitEdit2_disable = false
+      this.dialogFormVisible2 = true
     },
     submitEdit2(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.submitEdit2_disable = true
           editPerson(this.form2.姓名, this.form2.职务, this.form2.电话, this.form2.手机, this.form2.传真, this.form2.供应商联系人流水号).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('编辑成功')