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

src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue

@@ -22,7 +22,7 @@
     <el-row>
       <el-col :span="8">
         <el-card>
-          <el-table :data="tableData1" :row-class-name="tableRowClassName" style="height: 670px" highlight-current-row border>
+          <el-table :data="tableData1" :row-class-name="tableRowClassName" empty-text="   " style="height: 670px" highlight-current-row border>
             <el-table-column align="center" label="工序名" width="110">
               <template slot-scope="scope">
                 {{ scope.row.工艺名称 }}

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -250,12 +250,13 @@ export default {
       }
     },
     edit2() {
+      console.log(this.$store.state.user.id, 9090)
       if (this.tableData2.length === 0) {
         this.$message.warning('暂无数据')
       } else {
         this.a = 0
         for (let i = 0; i < this.tableData2.length; i++) {
-          edit2(this.tableData2[i].工艺计划流水号).then(response => {
+          edit2(this.tableData2[i].工艺计划流水号, this.$store.state.user.id).then(response => {
             this.a += parseInt(response.data[0].result)
             if (this.a === this.tableData2.length) {
               this.pageSize = 10

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -312,20 +312,15 @@
     </el-row>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="350px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-form-item label="请购车间" prop="请购车间">
-          <el-input
-            v-model="form.请购车间"
-            size="small"
-            style="width:160px"/>
+        <el-form-item label="请款单号" prop="请款单号">
+          <el-input :disabled="true" v-model="form.请款单号" size="small" style="width:160px"/>
+        </el-form-item>
+        <el-form-item v-show="false" label="请购车间" prop="请购车间">
+          <el-input v-model="form.请购车间" size="small" style="width:160px"/>
         </el-form-item>
         <el-form-item label="请购人员">
-          <el-input
-            v-model="name"
-            size="small"
-            readonly
-            style="width:160px;"/>
+          <el-input v-model="name" size="small" readonly style="width:160px;"/>
         </el-form-item>
-
         <el-form-item label="请购时间" prop="请购时间">
           <el-date-picker
             v-model="form.请购时间"
@@ -337,10 +332,7 @@
             placeholder="选择日期"/>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input
-            v-model="form.Remarks"
-            size="small"
-            style="width:160px"/>
+          <el-input v-model="form.Remarks" size="small" style="width:160px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -349,6 +341,7 @@
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
+
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="零件数量" center style="min-height: 300px" width="400px">
       <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="数量" prop="数量">
@@ -557,7 +550,7 @@
 </template>
 
 <script>
-import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
+import { searchBillNumber, DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 import { getNowShotTime } from '@/utils/tool'
 import Cookie from 'js-cookie'
@@ -601,6 +594,7 @@ export default {
       dialogFormVisible: false,
       RequisitionList: '',
       form: {
+        请款单号: '',
         请购单编号: '',
         请购车间: '制造部',
         请购时间: '',
@@ -1040,6 +1034,9 @@ export default {
     handleAdd() {
       this.handleAdd_disable = false
       this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
+      searchBillNumber().then(response => {
+        this.form.请款单号 = response.data[0].单号
+      })
       this.form.请购时间 = getNowShotTime()
     },
     submitAdd(formName) {

src/views/ManufacturingCenter/ProductionPlanQuery/index.vue

@@ -127,7 +127,7 @@ export default {
     loginsession() {
       this.$axios({
         methods: 'post',
-        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000',
+        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=1222',
         data: {
           userName: '0000'
         }

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -188,7 +188,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="submit('form')">确定</el-button>
+        <el-button :disabled="ADD_disable" type="primary" @click="submit('form')">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -201,6 +201,7 @@ import { getNowTime } from '@/utils/tool'
 export default {
   data() {
     return {
+      ADD_disable: false,
       equipmentName: '', // 设备名称
       List: [],
       check: 0,
@@ -296,7 +297,6 @@ export default {
         this.$refs['form'].resetFields()
       }
       this.title = '编辑设备'
-      this.dialogFormVisible = true
       this.form.设备名称 = row.设备名称
       this.form.设备编号 = row.设备编号
       this.form.设备型号 = row.设备型号
@@ -308,6 +308,8 @@ export default {
       this.form.整改工时系数 = row.整改工时比例
       this.form.预留工时系数 = row.设备预留工时系数
       this.equipmentSerialNumber = row.设备流水号
+      this.ADD_disable = false
+      this.dialogFormVisible = true
     },
     submit(formName) {
       this.$refs[formName].validate((valid) => {
@@ -321,6 +323,7 @@ export default {
       })
     },
     submitAdd() {
+      this.ADD_disable = true
       for (let i = 0; i < this.processingName.length; i++) {
         if (this.form.设备加工工艺 === this.processingName[i].value) {
           this.processing1 = this.processingName[i].processing
@@ -336,19 +339,21 @@ export default {
           this.dialogFormVisible = false
           this.fetchData()
         } else {
+          this.ADD_disable = false
           this.$message.error('信息添加失败')
         }
       })
     },
     ADD() {
       this.addForm('form')
-      this.dialogFormVisible = true
       this.form.contractSigningDate = getNowTime()// new Date()
       this.temp = 1
-      this.title = '增加'
+      this.title = '新增设备'
+      this.ADD_disable = false
+      this.dialogFormVisible = true
     },
     submitEdit() {
-      console.log(2323)
+      this.ADD_disable = true
       editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
         if (response.data[0].result === '1') {
           this.$notify({
@@ -360,6 +365,7 @@ export default {
           this.title = ''
           this.fetchData()
         } else {
+          this.ADD_disable = false
           this.$message.error('信息编辑失败')
         }
       })