Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -379,7 +379,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form10')">取消</el-button>
-        <el-button type="primary" @click="submit10('form10')">确定</el-button>
+        <el-button :disabled="openUrgentItem_disable" type="primary" @click="submit10('form10')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -394,6 +394,7 @@ import Cookie from 'js-cookie'
 export default {
   data() {
     return {
+      openUrgentItem_disable: false,
       checked_hebing: true,
       checked_UrgentItem: false,
       UrgentItem: 0,
@@ -619,6 +620,7 @@ export default {
       if (this.$refs['form10'] !== undefined) {
         this.$refs['form10'].resetFields()
       }
+      this.openUrgentItem_disable = false
       this.dialogFormVisible10 = true
     },
     typeChange() {
@@ -705,11 +707,13 @@ export default {
     submit10(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.openUrgentItem_disable = true
           addUrgentItem(this.form10.机床号, this.form10.组号, this.form10.零件图号, this.form10.零件名称, this.form10.规格, this.form10.零件数量, this.form10.零件备注, this.id, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('添加成功')
               this.dialogFormVisible10 = false
             } else {
+              this.openUrgentItem_disable = false
               this.$message.error('添加失败')
             }
           })

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -345,7 +345,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel('form')">取消</el-button>
-        <el-button v-show="title==='增加'" type="primary" @click="submitAdd('form')">确定</el-button>
+        <el-button v-show="title==='增加'" :disabled="handleAdd_disable" type="primary" @click="submitAdd('form')">确定</el-button>
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
@@ -566,6 +566,7 @@ export default {
   inject: ['reload'],
   data() {
     return {
+      handleAdd_disable: false,
       dateRange: '',
       partNumber: '',
       dateRange1: '',
@@ -1037,19 +1038,24 @@ export default {
       })
     },
     handleAdd() {
+      this.handleAdd_disable = false
       this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
       this.form.请购时间 = getNowShotTime()
     },
     submitAdd(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.handleAdd_disable = true
           addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.dialogFormVisible = false
               this.tableData6 = []
               this.searchTable1()
-            } else { this.$message.error('增加失败') }
+            } else {
+              this.$message.error('增加失败')
+              this.handleAdd_disable = false
+            }
           })
         } else {
           console.log('error submit!!')

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -23,7 +23,7 @@
       <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
       <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
       <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
-      <el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>
+      <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
     </el-card>
     <el-row>
       <el-col style="width: 37%">
@@ -253,7 +253,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible3=false">取消</el-button>
-        <el-button type="primary" @click="submit3('form3')" >确定</el-button>
+        <el-button :disabled="EditWorkingHours_disable" type="primary" @click="submit3('form3')" >确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -265,6 +265,7 @@ import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8
 export default {
   data() {
     return {
+      EditWorkingHours_disable: false,
       index: -1,
       Machine: '', // 机床号
       Machines: [],
@@ -408,6 +409,7 @@ export default {
         this.$refs['form3'].resetFields()
       }
       this.getPerson_Form3()
+      this.EditWorkingHours_disable = false
       this.dialogFormVisible3 = true
     },
     getPerson_Form3() {
@@ -424,6 +426,7 @@ export default {
       })
     },
     submit3() {
+      this.EditWorkingHours_disable = true
       submitEdit3(this.processSerialNumber, this.form3.人员, this.form3.完成数量, this.form3.修补工时, this.form3.完成时间).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('补录成功')

src/views/ManufacturingCenter/ProductionPlanQuery/index.vue

@@ -23,6 +23,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
             <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
+            <!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
             <el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
               <el-checkbox v-model="all" size="small">加急</el-checkbox>
             </el-tooltip>
@@ -32,7 +33,7 @@
       </div>
     </div>
     <el-card>
-      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1000px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
+      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1090px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
         <el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -79,6 +80,11 @@
             {{ scope.row.投产时间 | formatTime }}
           </template>
         </el-table-column>
+        <el-table-column label="计划员" align="center" width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -118,6 +124,16 @@ export default {
     this.projectChange()
   },
   methods: {
+    loginsession() {
+      this.$axios({
+        methods: 'post',
+        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000',
+        data: {
+          userName: '0000'
+        }
+      }).then(res => {
+      })
+    },
     projectChange() {
       this.machineName = []
       this.machineNameValue = ''

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -231,7 +231,7 @@
         <el-input-number v-model="inputC" :step="1" :min="0" :max="spareNumber-SupplementationNumber" style="width: 100px" size="small" />
         <span>开始工序</span>
         <el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
-        <el-button :disabled="spareNumber-SupplementationNumber===0" type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
+        <el-button :disabled="spareNumber-SupplementationNumber<=0" type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
       </div>
     </el-card>
     <el-card v-show="false">
@@ -291,7 +291,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form2')">取消</el-button>
-        <el-button type="primary" @click="submit('form2')">确定</el-button>
+        <el-button :disabled="handleEdit_disable" type="primary" @click="submit('form2')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -310,7 +310,7 @@
         </el-form-item>
       </el-form>
       <div style="margin-left: 140px;margin-top: 10px">
-        <el-button type="primary" @click="submitRemark()">确定</el-button>
+        <el-button :disabled="handleEdit_disable" type="primary" @click="submitRemark()">确定</el-button>
       </div>
     </el-dialog>
 
@@ -323,6 +323,8 @@ import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      handleEdit_disable: false,
+      editB_disable: false,
       index: 0,
       remark1: '',
       remark2: '',
@@ -483,12 +485,12 @@ export default {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
-      console.log(index)
       this.index = index
       this.remark1 = ''
       this.remark2 = ''
       this.PCNumber = parseInt(row.批次数量)
       this.title = row.零件名称
+      this.handleEdit_disable = false
       this.dialogeditVisible = true
       this.form.input1 = row.零件图号
       this.code = row.工艺计划流水号
@@ -498,6 +500,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.form2.报废数量 > 0) {
+            this.handleEdit_disable = true
             editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间, this.id).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('报废成功')
@@ -509,6 +512,7 @@ export default {
                 }
                 // this.fetchTableData()
               } else {
+                this.handleEdit_disable = false
                 this.$message.success('报废失败')
               }
             })
@@ -538,15 +542,20 @@ export default {
     editB() {
       if (this.spareNumber - this.SupplementationNumber > 0) {
         if (this.inputC > 0) {
-          editA(this.CutCodeBefore, this.inputC).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('补投成功')
-              this.fetchTableData()
-              this.inputC = 0
-            } else {
-              this.$message.error('补投失败')
-            }
-          })
+          if (!this.editB_disable) {
+            this.editB_disable = true
+            editA(this.CutCodeBefore, this.inputC).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('补投成功')
+                this.fetchTableData()
+                this.inputC = 0
+                this.editB_disable = false
+              } else {
+                this.editB_disable = false
+                this.$message.error('补投失败')
+              }
+            })
+          }
         } else {
           this.$message.warning('补投数量不能为零')
         }