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

src/api/Inventory/SelfMadePartsWarehouseOut.js

@@ -49,14 +49,14 @@ export function searchdata(entryNameValue_check, entryNameValue, machineToolValu
   })
 }
 // 自制件出库
-export function warehousing(processPlanSerialNumber, leader, remarks) {
+export function warehousing(processPlanSerialNumber, outgoingQuantity, leader, remarks) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '自制件出库_循环执行_新',
-      param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks
+      param: '工艺计划流水号组=' + processPlanSerialNumber + '&出库数量组=' + outgoingQuantity + '&考勤编号=' + leader + '&出库备注=' + remarks
     }
   })
 }

src/api/MarketingCenter/ContractCapitalManagement.js

@@ -32,15 +32,47 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
     }
   })
 }
-export function searchTable2(pageCurrent, pageSize, num1) {
+export function searchTable2(num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同资金管理_分批资金_查询',
-      param: '资金ID=' + num1 + '=int',
-      Pagination: pageCurrent + '&' + pageSize
+      name: '基础表_合同资金表明细_查询数据',
+      param: '资金ID=' + num1 + '=int'
+    }
+  })
+}
+export function updateMoney(num1, money) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_编辑数据',
+      param: '资金明细ID=' + num1 + '&金额=' + money
+    }
+  })
+}
+export function addMoney(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_增加数据',
+      param: '资金ID=' + num1
+    }
+  })
+}
+export function deleteMoney(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_删除数据',
+      param: '资金明细ID=' + num1
     }
   })
 }

src/api/MarketingCenter/ContractInformationManagement.js

@@ -92,7 +92,7 @@ export function editchar() {
     data: {
       type: '2',
       name: '合同信息管理_合同信息_编辑',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12]
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] + '&合同总额=' + arguments[13]
     }
   })
 }

src/api/PurchasingCenter/OfflineContractSearch.js

@@ -25,3 +25,15 @@ export function searchOfflineContractContent(num) {
     }
   })
 }
+// 打回离线合同
+export function back(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线合同_打回合同',
+      param: `离线合同流水号=${num}`
+    }
+  })
+}

src/utils/request.js

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service

src/views/Inventory/SelfMadePartsWarehouseOut/index.vue

@@ -2,39 +2,39 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">
-          <el-option
-            v-for="item in entryName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">
-          <el-option
-            v-for="item in machineTool"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px">
-          <el-option
-            v-for="item in groupNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
+        <!--        <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">-->
+        <!--          <el-option-->
+        <!--            v-for="item in entryName"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-select v-model="machineToolValue" placeholder="机床号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">-->
+        <!--          <el-option-->
+        <!--            v-for="item in machineTool"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable style="width: 100px;margin: 10px 10px 0px 10px">-->
+        <!--          <el-option-->
+        <!--            v-for="item in groupNumber"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin: 10px 10px 0px 10px"/>
         <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
         <el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData" style="width: 760px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
+      <el-table :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
           width="45"/>
         <el-table-column align="center" label="序号" type="index" width="55px"/>
-        <el-table-column align="center" label="机床图号" width="110px">
+        <el-table-column align="center" label="机床图号" width="130px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -54,11 +54,26 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="数量" width="50px">
+        <el-table-column align="center" label="库存数量" width="90px">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.出库数量1 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="已出库数量" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.已出库数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="出库数量" width="140px">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.出库数量" :max="scope.row.出库数量1" :min="0" size="mini" style="width: 100%"/>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column align="center" label="入库数量" width="80px">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.入库数量 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <!--        <el-table-column align="center" label="状态" width="80px">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-tag v-if="scope.row.考核状态 === '8'">入库</el-tag>-->
@@ -89,7 +104,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
-          <el-select v-model="form.name" placeholder="请选择领料人" size="small" clearable style="width: 200px;">
+          <el-select v-model="form.name" placeholder="请选择领料人" size="small" filterable clearable style="width: 200px;">
             <el-option
               v-for="item in leaders"
               :key="item.value"
@@ -97,9 +112,9 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="人员编号" prop="leader" label-width="100px" size="small">
-          <el-input v-model="form.leader" size="small" placeholder="请输入人员编号" style="width: 200px"/>
-        </el-form-item>
+        <!--        <el-form-item label="人员编号" prop="leader" label-width="100px" size="small">-->
+        <!--          <el-input v-model="form.leader" size="small" placeholder="请输入人员编号" style="width: 200px"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible=false">取消</el-button>
@@ -138,6 +153,9 @@ export default {
       rules: {
         leader: [{ required: true, message: '请输入' }]
       },
+      shuzu: [],
+      keyichuku: 1,
+      outgoingQuantity: [],
       departments: [], // 部门
       leaders: [] // 领料人
     }
@@ -148,12 +166,27 @@ export default {
   },
   methods: {
     searchData() {
+      this.tableData = []
       const entryNameValue_check = this.entryNameValue === '' || this.entryNameValue === null ? 0 : 1
       const machineToolValue_check = this.machineToolValue === '' || this.machineToolValue === null ? 0 : 1
       const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
       const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
       searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
-        this.tableData = response.data.rows
+        if (response.data.rows.length !== 0) {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            this.tableData.push({
+              机床图号: response.data.rows[i].机床图号,
+              组号: response.data.rows[i].组号,
+              零件图号: response.data.rows[i].零件图号,
+              零件名称: response.data.rows[i].零件名称,
+              已出库数量: Number(response.data.rows[i].出库数量),
+              入库数量: Number(response.data.rows[i].入库数量),
+              工艺计划流水号: response.data.rows[i].工艺计划流水号,
+              出库数量: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量),
+              出库数量1: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量)
+            })
+          }
+        }
         this.total = response.data.total
       })
     },
@@ -220,8 +253,8 @@ export default {
       }
     }, // 入库
     wareHousing() {
-      console.log(this.multipleSelection, 121212)
-      if (this.multipleSelection.length === 0) {
+      console.log(this.shuzu, 121212)
+      if (this.shuzu.length === 0) {
         this.$message.warning('请勾选出库物料')
       } else {
         this.selectDepartment()
@@ -230,26 +263,42 @@ export default {
       }
     }, // 多选
     handleSelectionChange(val) {
-      this.multipleSelection = []
-      val.map(v => {
-        this.multipleSelection.push(v.工艺计划流水号)
-      })
+      this.shuzu = []
+      this.shuzu = val
+      // val.map(v => {
+      //   this.multipleSelection.push(v.工艺计划流水号)
+      //   this.outgoingQuantity.push(v.出库数量)
+      // })
     },
     CHUKU() {
-      console.log(this.form.name, 909090, this.form.leader)
-      if (Number(this.form.leader) === Number(this.form.name)) {
-        warehousing(this.multipleSelection, this.form.leader, this.remarks).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('出库成功')
-            this.dialogFormVisible = false
-            this.searchData()
-          } else {
-            this.$message.error('出库失败')
-            this.dialogFormVisible = false
-          }
-        })
+      this.keyichuku = 1
+      this.multipleSelection = []
+      this.outgoingQuantity = []
+      this.shuzu.map(v => {
+        if (v.出库数量 !== 0) {
+          this.multipleSelection.push(v.工艺计划流水号)
+          this.outgoingQuantity.push(v.出库数量)
+        } else {
+          this.keyichuku = 0
+        }
+      })
+      if (this.keyichuku === 1) {
+        if (this.form.name === '') {
+          this.$message.error('请选择领料人')
+        } else {
+          warehousing(this.multipleSelection, this.outgoingQuantity, this.form.name, this.remarks).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('出库成功')
+              this.dialogFormVisible = false
+              this.searchData()
+            } else {
+              this.$message.error('出库失败')
+              this.dialogFormVisible = false
+            }
+          })
+        }
       } else {
-        this.$message.error('人员编号错误')
+        this.$message.error('请选择正确的出库数量')
       }
     },
     handleSizeChange(val) {

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -69,7 +69,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 670px">
+      <el-col style="width: 810px">
         <el-card>
           <el-table
             :data="tableData"
@@ -90,7 +90,7 @@
                 {{ scope.row.跟单号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="130">
+            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="180">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -119,7 +119,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同总额" prop="合同总额" width="140" show-overflow-tooltip>
+        <el-table-column align="right" label="合同总额(万元)" prop="合同总额" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ Number(scope.row.合同总金额).toFixed(2) }}
           </template>
@@ -289,7 +289,7 @@
               <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
             </el-form-item>
           </el-col>
-          <el-col v-show="isTrue" :span="12">
+          <el-col :span="12">
             <el-form-item label="合同总额" prop="contractAmount">
               <el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
             </el-form-item>
@@ -367,7 +367,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="付款方式" prop="付款方式">
-              <el-select v-model="form.付款方式" :disabled="disabled" placeholder="请选择付款方式" size="small" style="width: 200px">
+              <el-select v-model="form.付款方式" placeholder="请选择付款方式" size="small" style="width: 200px">
                 <el-option
                   v-for="item in money"
                   :key="item.value"
@@ -998,7 +998,7 @@ export default {
       this.isTrue = false
     },
     chaEdit() {
-      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
+      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('信息更新成功')

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -542,8 +542,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="供应商名称" prop="供应商名称">
-              <el-select v-model="form2.供应商名称" style="width:150px" placeholder="供应商" size="small" filterable>
+            <el-form-item label="供应商名称" prop="供应商流水号">
+              <el-select v-model="form2.供应商流水号" style="width:150px" placeholder="供应商" size="small" filterable>
                 <el-option
                   v-for="item in supplierNames"
                   :key="item.value"
@@ -785,7 +785,7 @@ export default {
       rules2: { // 离线合同表单验证规则
         离线合同编号: [{ required: true, message: '请填写离线合同编号' }],
         离线合同名称: [{ required: true, message: '请填写离线合同名称' }],
-        供应商名称: [{ required: true, message: '请选择供应商' }],
+        供应商流水号: [{ required: true, message: '请选择供应商' }],
         规定到货时间: [{ required: true, message: '请选择规定到货时间' }],
         运费: [{ required: true, message: '请填写运费' }],
         付款方式: [{ required: true, message: '请选择付款方式' }]
@@ -823,6 +823,7 @@ export default {
   created() {
     this.getPerson()
     this.projectChange()
+    this.getSupplier1()
     // this.searchTable2()
     this.searchTable11()
     this.initDirection()
@@ -1082,7 +1083,6 @@ export default {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
-      this.getSupplier1()
       this.title2 = '创建离线合同'
       getBillNum().then(response => { // 查询询价单号
         this.form2.离线合同编号 = response.data[0].单号
@@ -1095,8 +1095,6 @@ export default {
       })
     },
     getSupplier1() {
-      this.supplierNames = []
-      this.form2.供应商名称 = ''
       searchSupplier1(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.supplierNames.push({
@@ -1118,7 +1116,7 @@ export default {
             if (numGroup1.indexOf(this.form2.离线合同编号) !== -1) {
               this.$message.error('该离线合同编号已存在')
             } else {
-              addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商名称, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
+              addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
                 if (response.data[0].result === '1') {
                   this.$message.success('新建离线合同成功')
                   this.offlineContract = this.form2.离线合同编号
@@ -1142,7 +1140,7 @@ export default {
       this.form2.离线合同流水号 = row.离线合同流水号
       this.form2.离线合同编号 = row.离线合同编号
       this.form2.离线合同名称 = row.离线合同名称
-      this.form2.供应商流水号 = row.供应商流水号
+      this.form2.供应商流水号 = parseInt(row.供应商流水号)
       this.form2.供应商名称 = row.供应商名称
       this.form2.规定到货时间 = row.规定到货时间
       this.form2.离线合同备注 = row.离线合同备注

src/views/PurchasingCenter/OfflineContractSearch/index.vue

@@ -11,6 +11,12 @@
             icon="el-icon-search"
             style="margin-left:10px"
             @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="el-icon-back"
+            style="margin-left:10px"
+            @click="back">打回</el-button>
         </el-row>
       </div>
     </el-card>
@@ -109,7 +115,7 @@
 </template>
 
 <script>
-import { searchOfflineContract, searchOfflineContractContent } from '@/api/PurchasingCenter/OfflineContractSearch'
+import { searchOfflineContract, searchOfflineContractContent, back } from '@/api/PurchasingCenter/OfflineContractSearch'
 import QRCode from 'qrcode'
 import $ from 'jquery'
 export default {
@@ -119,6 +125,7 @@ export default {
       contractNumber: '',
       supplierName: '',
       total1: 0,
+      number: '',
       pageCurrent1: 1,
       pageSize1: 20,
       tableData1: [],
@@ -152,7 +159,28 @@ export default {
       this.pageCurrent1 = val
       this.searchTable1()
     },
+    back() {
+      this.$confirm('确定打回合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.number) {
+          back(this.number).then(response => {
+            if (response.data[0].result !== '0') {
+              this.$message.success('打回成功')
+              this.searchTable1()
+            } else {
+              this.$message.success('打回失败')
+            }
+          })
+        } else {
+          this.$message.warning('请选择要打回的合同')
+        }
+      })
+    },
     searchTable2(row) {
+      this.number = row.离线合同流水号
       searchOfflineContractContent(row.离线合同流水号).then(response => {
         this.contractDetail = response.data
         this.showOffline(row)