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

2019-01-01 16:55:34 +08:00
parent b8da0f7dee 144b5f9c8a
commit bfb9182547
5 changed files with 51 additions and 28 deletions
--- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
+++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
@@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) {
    }
  })
 }
-// 传送人接收人初始化
+// 接收人初始化
 export function initPerson() {
  return request({
    url: '',
@@ -61,6 +61,18 @@ export function initPerson() {
    }
  })
 }
+// 传送人初始化
+export function initPerson1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=5'
+    }
+  })
+}
 // 初始化合同号
 export function initContract() {
  return request({
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -7,7 +7,7 @@
        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
        <el-checkbox v-model="all" size="mini" @change="searchTable">查询全部</el-checkbox>
        <el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">到货</el-button>
-        <el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">刷新</el-button>
+        <!--<el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">刷新</el-button>-->
      </el-row>
    </el-card>

--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -1571,8 +1571,6 @@ export default {
  span{
    margin: 10px 0 10px 10px;
  }
-</style>
-<style>
  td{
    width: 100px;
    height: 30px;
@@ -1594,8 +1592,6 @@ export default {
    width: 7%;
    text-align: left;
  }
-</style>
-<style>
  .el-table .chajia {
    background: #EBF953;
  }
@@ -1606,4 +1602,3 @@ export default {
    height: 30px;
  }
 </style>
-
--- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue
+++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue
@@ -78,18 +78,18 @@
            {{ scope.row.废品数量 }}
          </template>
        </el-table-column>
-        <el-table-column label="不合格处理方式" align="center">
+        <el-table-column label="不合格处理方式" width="200" align="center">
          <template slot-scope="scope">
            {{ scope.row.不合格处理方式 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" width="130px" align="center">
+        <el-table-column label="操作" width="130px" align="center" fixed="right">
          <template slot-scope="scope">
            <el-button
              size="mini"
              type="primary"
              class="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row, 'form')">编辑</el-button>
+              @click="handleEdit(scope.$index, scope.row, 'form')">扣款</el-button>
          </template>
        </el-table-column>

@@ -107,7 +107,7 @@
      </div>
    </el-card>

-    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="20%">
+    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
      <el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm" label-width="100px" style="width: 90%;margin: auto">

        <el-form-item label="废品数量" prop="wasteQuantity">
@@ -138,6 +138,7 @@ import { initOutHelp, searchTable, editList } from '@/api/Outsourcing/Unqualifie
 export default {
  data() {
    return {
+      num_bhg: '',
      count2: 0,
      form: {
        wasteQuantity: '', // 废品数量
@@ -165,6 +166,7 @@ export default {
  },
  created() {
    this.fetchData()
+    this.searchTable()
  },
  methods: {
    fetchData() {
@@ -218,24 +220,29 @@ export default {
      }
      this.number = row.外协加工任务单明细流水号
      this.form.wasteQuantity = row.废品数量
+      this.num_bhg = row.批次数量
      this.form.processingMethod = row.不合格处理方式
      this.dialogFormVisible1 = true
    },
    // 提交编辑
    submitEdit() {
-      editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => {
-        if (response.data[0].result === '1') {
-          this.dialogFormVisible1 = false
-          this.$message({
-            type: 'success',
-            message: '信息更新成功!'
-          })
-          this.searchTable()
-        } else {
-          this.dialogFormVisible1 = false
-          this.$message.error('信息更新失败')
-        }
-      })
+      if (this.form.wasteQuantity > this.num_bhg) {
+        this.$message.error('废品数量大于总数量')
+      } else {
+        editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => {
+          if (response.data[0].result === '1') {
+            this.dialogFormVisible1 = false
+            this.$message({
+              type: 'success',
+              message: '信息更新成功!'
+            })
+            this.searchTable()
+          } else {
+            this.dialogFormVisible1 = false
+            this.$message.error('信息更新失败')
+          }
+        })
+      }
    },
    // 提交添加或者修改
    submit(formName) {
--- a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
+++ b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
@@ -19,7 +19,7 @@
      <span>传送人:</span>
      <el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:100px">
        <el-option
-          v-for="item in selectPerson"
+          v-for="item in selectPerson1"
          :key="item.value"
          :label="item.label"
          :value="item.value"/>
@@ -160,7 +160,7 @@
        <el-form-item label="传送人" prop="sendPerson">
          <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
            <el-option
-              v-for="item in selectPerson"
+              v-for="item in selectPerson1"
              :key="item.value"
              :label="item.label"
              :value="item.value"/>
@@ -189,7 +189,7 @@
 </template>

 <script>
-import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initContract } from '@/api/WorkshopProcurement/ReceiptConnectionSheet'
+import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initPerson1, initContract } from '@/api/WorkshopProcurement/ReceiptConnectionSheet'
 import { mapGetters } from 'vuex'

 export default {
@@ -201,7 +201,8 @@ export default {
      invoiceNum: '',
      invoiceTime: '',
      transmitValue: '',
-      selectPerson: [], // 传送人接收人
+      selectPerson: [], // 接收人
+      selectPerson1: [], // 传送人
      recipientValue: '',
      contractNum: '',
      pageCurrent1: 1,
@@ -266,6 +267,14 @@ export default {
          })
        }
      })
+      initPerson1().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.selectPerson1.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
    },
    searchTable1() {
      this.invoiceNum ? this.check1 = 1 : this.check1 = 0