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

src/api/BasicData/WorkshopProcessMaintenance.js

@@ -1,13 +1,12 @@
 import request from '@/utils/request'
 // 查工艺分类名称
-export function searchProcessClassification(ProcessClassification) {
+export function searchProcessClassification() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_基础表_工艺分类名称_查询数据',
+      name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
-      param: '工艺分类名称=' + ProcessClassification
     }
   })
 }

src/api/ManufacturingCenter/ProcessPlanning.js

@@ -8,7 +8,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=9'
     }
   })
 }

src/api/ManufacturingCenter/ProcessTaskAssignment.js

@@ -129,7 +129,7 @@ export function initPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17=int'
+      param: '考核部门编号=9'
     }
   })
 }

src/api/ManufacturingCenter/ProcessingStatus.js

@@ -43,7 +43,6 @@ export function getTable(stepNumber, a, b, c, d, e, f, g, i, pageCurrent, pageSi
     data: {
       type: '1',
       name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程',
-      // param: '项目流水号_check=0=string&项目流水号=428=string&机床流水号_check=0=string&机床流水号=8903=string&组件流水号_check=1=string&组件流水号=39539=string&零件图号_check=0=string&零件图号=0=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=string',
       param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=' + i + '=string&考核状态=6=int',
       Pagination: pageCurrent + '&' + pageSize
     }

src/api/ManufacturingCenter/QuotaFormulation.js

@@ -32,7 +32,7 @@ export function getPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17=int'
+      param: '考核部门编号=9'
 
     }
   })

src/api/ManufacturingCenter/WorkshopEquipmentManagement.js

@@ -30,7 +30,7 @@ export function addTable(equipmentName, equipmentModel, performance, processingC
     data: {
       type: '2',
       name: '设备管理_设备加工能力_增加数据_设备维护New',
-      param: '设备名称=' + equipmentName + '=string&设备型号=' + equipmentModel + '=string&设备性能指标=' + performance + '= string&设备加工能力工时=' + processingCapacity + '=string&设备工时系数=' + workingTimeFactor + '=string&工艺名称简称=' + processName + '=string&工艺编号=' + processNumber + '=string&班次类型=' + shift + '= string&整改工时系数=' + reorganizationTimeFactor + '=string&设备编号=' + equipmentNumber + '=string&预留工时系数=' + reservedTimeFactor
+      param: '设备名称=' + equipmentName + '&设备型号=' + equipmentModel + '&设备性能指标=' + performance + '&设备加工能力工时=' + processingCapacity + '&设备工时系数=' + workingTimeFactor + '&工艺名称简称=' + processName + '&工艺编号=' + processNumber + '&班次类型=' + shift + '&整改工时系数=' + reorganizationTimeFactor + '&设备编号=' + equipmentNumber + '&预留工时系数=' + reservedTimeFactor
     }
   })
 }

src/views/BasicData/WorkshopProcessMaintenance/index.vue

@@ -102,7 +102,6 @@
             </el-table-column>
           </el-table>
         </el-card>
-
       </el-col>
     </el-row>
     <el-dialog :visible.sync="dialogFormVisible1" title="增加工艺分类" center style="min-height: 300px" width="400px">
@@ -242,13 +241,14 @@ export default {
   methods: {
     searchProcessClassification() {
       this.loading1 = true
-      searchProcessClassification(this.ProcessClassification).then(response => {
+      searchProcessClassification().then(response => {
         this.loading1 = false
         this.tableData1 = response.data
         this.total1 = response.data
         return this.tableData1
       }).then(data => {
         this.Num = data
+        this.max = []
         for (let i = 0; i < this.Num.length; i++) {
           this.max.push(this.Num[i].工艺分类流水号)
         }

src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue

@@ -609,7 +609,7 @@ export default {
         this.form.完成时间 = ''
         this.form.人员 = ''
         this.form.考勤编号 = ''
-        if (this.worker[index][a] !== '请选择') {
+        if (this.worker[index][a] !== '超级管理员') {
           this.midd = 1
           this.form.人员 = this.worker[index][a]
         }

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -308,6 +308,7 @@ export default {
                   numm: response.data[i].工艺计划流水号
                 })
               }
+              this.listLoading = false
             }
           })
         })

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -98,18 +98,6 @@
               <el-input v-model="form.设备型号" placeholder="设备型号" size="small" style="width:200px" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span = "12">
-            <el-form-item label="设备性能指标" prop="设备性能指标" >
-              <el-input v-model="form.设备性能指标" placeholder="设备性能指标" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span = "12">
-            <el-form-item label="设备加工能力" prop="设备加工能力" >
-              <el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
-            </el-form-item>
-          </el-col>
           <el-col :span = "12">
             <el-form-item label="设备加工工艺" prop="设备加工工艺" >
               <el-select v-model="form.设备加工工艺" placeholder="设备加工工艺" size="small" style="width:200px" clearable >
@@ -122,7 +110,19 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-show="title!=='增加'">
+          <el-col :span = "12">
+            <el-form-item label="设备加工能力" prop="设备加工能力" >
+              <el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span = "12">
+            <el-form-item label="设备性能指标" prop="设备性能指标" >
+              <el-input v-model="form.设备性能指标" placeholder="设备性能指标" size="small" style="width:200px" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="title!=='增加'">
           <el-col :span = "12">
             <el-form-item label="班次类型" prop="班次类型" >
               <el-select v-model="form.班次类型" placeholder="班次类型" size="small" style="width:200px" clearable >
@@ -140,7 +140,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-show="title!=='增加'">
           <el-col :span = "12">
             <el-form-item label="整改工时系数" prop="整改工时系数" >
               <el-input v-model="form.整改工时系数" placeholder="整改工时系数" size="small" style="width:200px" clearable />
@@ -200,12 +200,12 @@ export default {
         设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }],
         设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }],
         设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }],
-        设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
+        设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }]
-        设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }],
+        // 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
-        班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
+        // 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
-        设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
+        // 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }],
-        整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
+        // 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }],
-        预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
+        // 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }]
       }
     }
   },
@@ -241,9 +241,20 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.dialogFormVisible = true
       this.title = '增加'
-      this.form = {}
+      this.form = {
+        设备名称: '',
+        设备编号: '',
+        设备型号: '',
+        设备加工工艺: ''
+      }
+      this.form.设备性能指标 = 1
+      this.form.设备加工能力 = 1
+      this.form.班次类型 = 1
+      this.form.设备工时系数 = 1
+      this.form.整改工时系数 = 1
+      this.form.预留工时系数 = 1
+      this.dialogFormVisible = true
     },
     handleEdit(row) {
       if (this.$refs['form'] !== undefined) {
@@ -268,10 +279,8 @@ export default {
         if (valid) {
           if (this.title === '增加') {
             this.submitAdd()
-            this.title = ''
           } else if (this.title === '编辑') {
             this.submitEdit()
-            this.title = ''
           }
         }
       })
@@ -290,6 +299,7 @@ export default {
             type: 'success'
           })
           this.dialogFormVisible = false
+          this.title = ''
           this.fetchData()
         } else {
           this.$message.error('信息添加失败')
@@ -305,6 +315,7 @@ export default {
             type: 'success'
           })
           this.dialogFormVisible = false
+          this.title = ''
           this.fetchData()
         } else {
           this.$message.error('信息编辑失败')

src/views/Outsourcing/InterBudgetaryBudgets/index.vue

@@ -281,7 +281,6 @@ export default {
       this.tableData = []
       if (this.radio === 1) {
         searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => {
-          console.log(response.data)
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
         }).then(() => {

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -113,12 +113,12 @@
             <el-input v-model="scope.row.工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
           </template>
         </el-table-column>
-        <el-table-column label="机加工开始日期" align="center" width="150px">
+        <el-table-column label="机加工计划开始日期" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.机加工开始时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="机加工结束日期" align="center" width="150px">
+        <el-table-column label="机加工计划结束日期" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.机加工结束时间 }}
           </template>
@@ -266,14 +266,14 @@ export default {
     },
     // 修改外协状态
     edit(index, row) {
+      this.count = 0
       for (let i = 0; i < this.tableData2.length; i++) {
         if (this.checkBox[i] === false) {
           this.count = this.count + 1
         }
       }
       if (this.count === this.tableData2.length) {
-        edit2(row.工序流水号, row.工艺计划流水号, 0).then(response => {
+        edit2(row.工序流水号, row.工艺计划流水号, 0)
-        })
       }
       if (this.checkBox[index] === true) {
         this.InOut = 2

src/views/login/index.vue

@@ -41,63 +41,43 @@
           </el-button>
           <div class="tips">
             <span>超级管理员</span>
-            <span>账号：1001</span>
+            <span>账号：0000</span>
-            <span>密码：1001</span>
+            <span>密码：admin</span>
           </div>
           <div class="tips">
-            <span>采购管理员</span>
+            <span>营销中心</span>
-            <span>账号：6201</span>
+            <span>账号：2001</span>
-            <span>密码：6201</span>
+            <span>密码：2001</span>
           </div>
           <div class="tips">
-            <span>外协管理员</span>
+            <span>技术中心</span>
-            <span>账号：1003</span>
-            <span>密码：1003</span>
-          </div>
-          <div class="tips">
-            <span>车间计划管理员</span>
-            <span>账号：2002</span>
-            <span>密码：2002</span>
-          </div>
-          <div class="tips">
-            <span>技术中心管理员</span>
             <span>账号：3001</span>
             <span>密码：3001</span>
           </div>
           <div class="tips">
-            <span>库存管理员</span>
+            <span>制造中心</span>
-            <span>账号：3002</span>
-            <span>密码：3002</span>
-          </div>
-          <div class="tips">
-            <span>营销中心管理员</span>
             <span>账号：4001</span>
             <span>密码：4001</span>
           </div>
           <div class="tips">
-            <span>财务总监</span>
+            <span>采购部</span>
-            <span>账号：7001</span>
+            <span>账号：4101</span>
-            <span>密码：7001</span>
+            <span>密码：4101</span>
           </div>
           <div class="tips">
-            <span>出纳</span>
+            <span>仓库</span>
-            <span>账号：7002</span>
+            <span>账号：4201</span>
-            <span>密码：7002</span>
+            <span>密码：4201</span>
           </div>
           <div class="tips">
-            <span>会计</span>
+            <span>金工车间</span>
-            <span>账号：7003</span>
+            <span>账号：4301</span>
-            <span>密码：7003</span>
+            <span>密码：4301</span>
           </div>
           <div class="tips">
-            <span>总经理</span>
+            <span>装配车间</span>
-            <span>账号：1002</span>
+            <span>账号：4401</span>
-            <span>密码：1002</span>
+            <span>密码：4401</span>
-          </div>
-          <div class="tips">
-            <span>工艺定额员</span>
-            <span>账号：6301</span>
-            <span>密码：6301</span>
           </div>
         </div>
       </el-form>