更新

src/views/Inventory/Inboundscanning/index.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-card style="width: 1000px">
       <el-row>
-        <span style="margin-left: 10px">零件图号</span>
+        <span style="margin-left: 10px">跟单号</span>
-        <el-input v-model="Partpaint" clearable size="small" style="width:170px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
+        <el-input v-model="partNumber" clearable size="small" style="width:170px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
-        <el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="getscantable()">查询</el-button>
-        <el-tooltip :open-delay="1200" effect="dark" content="清除所有机床零件信息" placement="top">
+        <!--<el-tooltip :open-delay="1200" effect="dark" content="清除所有机床零件信息" placement="top">-->
-          <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
+        <!--<el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>-->
-        </el-tooltip>
+        <!--</el-tooltip>-->
-        <el-tooltip :open-delay="1200" effect="dark" content="将所有机床零件入库" placement="top">
+        <el-tooltip :open-delay="1200" effect="dark" content="自制件件入库" placement="top">
           <el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
         </el-tooltip>
       </el-row>
@@ -58,16 +58,16 @@
             <el-input v-model="tableData[scope.$index].note" clearable size="mini"/>
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="100" align="center">
+        <!--<el-table-column label="操作" min-width="100" align="center">-->
-          <template slot-scope="scope">
+        <!--<template slot-scope="scope">-->
-            <el-button
+        <!--<el-button-->
-              :disabled="scope.row.是否禁用"
+        <!--:disabled="scope.row.是否禁用"-->
-              size="mini"
+        <!--size="mini"-->
-              type="danger"
+        <!--type="danger"-->
-              class="el-icon-delete"
+        <!--class="el-icon-delete"-->
-              @click="handleDelete(scope.$index, scope.row)">移除</el-button>
+        <!--@click="handleDelete(scope.$index, scope.row)">移除</el-button>-->
-          </template>
+        <!--</template>-->
-        </el-table-column>
+        <!--</el-table-column>-->
       </el-table>
     </el-card>
 
@@ -108,7 +108,7 @@ export default {
       ace: 0,
       a: '',
       tableData: [],
-      partNumber: [],
+      partNumber: '',
       listLoading: false,
       craftplannumber: '',
       radio2: 3,
@@ -162,7 +162,7 @@ export default {
     websocketonmessage(msg) {
       this.partNumber = msg.data.split('|')[3]
       this.partNumber = this.partNumber.slice(1)
-      this.getPaint(this.partNumber)
+      this.getscantable(this.partNumber)
     },
     // 关闭
     websocketclose() {
@@ -198,13 +198,6 @@ export default {
     // 根据流水号查询
     getscantable() {
       // this.tableData = []
-      if (this.partNumber.length === 0) {
-        this.$notify({
-          title: '警告',
-          message: '请输入正确的零件图号',
-          type: 'warning'
-        })
-      } else {
       this.finishParts = []
       this.listLoading = true
       searchTable(this.partNumber).then(response => {
@@ -217,26 +210,9 @@ export default {
             type: 'warning'
           })
         } else {
+          console.log(response.data, 1233)
           for (let i = 0; i < response.data.length; i++) {
-              if (response.data[i].状态 === '未完成') {
+            if (response.data[i].考核状态 === 7) {
-                this.$notify({
-                  title: '警告',
-                  message: 'P' + response.data[i].工艺计划流水号 + '未加工完成',
-                  type: 'warning'
-                })
-              } else if (response.data[i].状态 === '可完成') {
-                this.finishParts.push({
-                  plannumber: response.data[i].剩余数量,
-                  innumber: response.data[i].入库数量,
-                  capture: '',
-                  note: '',
-                  工艺计划流水号: response.data[i].工艺计划流水号,
-                  项目名称: response.data[i].项目名称,
-                  机床图号: response.data[i].机床图号,
-                  零件图号: response.data[i].零件图号
-                })
-              } else if (response.data[i].状态 === '已完成') {
-                if (response.data[i].考核状态 === '7') {
               this.listLoading = false
               this.tableData.push({
                 plannumber: response.data[i].剩余数量,
@@ -262,13 +238,19 @@ export default {
                 })
                 return preVal
               }, [])
-                } else if (response.data[i].考核状态 === '8') {
+            } else if (response.data[i].考核状态 === 6) {
+              this.$notify({
+                title: '警告',
+                message: 'P' + response.data[i].工艺计划流水号 + '未加工完成',
+                type: 'warning'
+              })
+            } else if (response.data[i].考核状态 === 8) {
               this.$notify({
                 title: '警告',
                 message: 'P' + response.data[i].工艺计划流水号 + '已入库',
                 type: 'warning'
               })
-                } else if (response.data[i].考核状态 === '9') {
+            } else if (response.data[i].考核状态 === 9) {
               this.$notify({
                 title: '警告',
                 message: 'P' + response.data[i].工艺计划流水号 + '已出库',
@@ -277,14 +259,12 @@ export default {
             }
           }
         }
-          }
       }).then(() => {
-          if (this.finishParts.length > 0) {
+        // if (this.finishParts.length > 0) {
-            this.dialogFormVisible = true
+        //   this.dialogFormVisible = true
-          }
+        // }
         this.listLoading = false
       })
-      }
     },
     FinishPart() {
       var nums = []

src/views/Inventory/OfflinePartOut/index.vue

@@ -258,6 +258,7 @@ export default {
       listLoading: '',
       listLoading1: '',
       partnumber: '',
+      outType: '',
       pageCurrent1: 1,
       pageSize1: 20,
       total1: 0,
@@ -272,7 +273,8 @@ export default {
       DirectNotes: [],
       department111: '', // 部门参数中间变量
       DirectNote111: '', // 人员参数中间变量
-      组件零件基本件流水号: ''
+      组件零件基本件流水号: '',
+      物料与货位对照流水号: ''
     }
   },
   computed: {

src/views/Inventory/OfflinePartsStorage/index.vue

@@ -53,7 +53,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div>
+      <div style="font-size: 5px">
         共{{ totallength }}条信息,选择{{ length }}条
       </div>
       <span v-show="false">仓库名称：</span>

src/views/Inventory/PickingListApproval/index.vue

@@ -2,54 +2,50 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
-        <span style="margin: 5px">领料单编号:</span>
+        <!--<span style="margin: 5px">领料单编号:</span>-->
-        <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
+        <el-input v-model="pickingListNumber" placeholder="领料单号/机床号/领料人" clearable size="small" style="width:200px" />
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
       </div>
-      <h4 style="margin-top:0">领料单</h4>
+      <!--<h4 style="margin-top:0">领料单</h4>-->
-      <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
+      <el-row>
+        <el-col style="width: 42%">
+          <el-card>
+            <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="600" @row-click="clickList">
               <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="领料单编号" align="center" min-width="200">
+              <el-table-column label="领料单编号" align="center" width="100">
                 <template slot-scope="scope">
                   {{ scope.row.领料单编号 }}
                 </template>
               </el-table-column>
-        <el-table-column label="创建时间" align="center" min-width="200" >
+              <el-table-column label="创建时间" align="center" width="80" >
                 <template slot-scope="scope">
                   {{ scope.row.操作日期.split(' ')[0] }}
                 </template>
               </el-table-column>
-        <el-table-column label="领料人" align="center" min-width="130">
+              <el-table-column label="领料人" align="center" width="80">
                 <template slot-scope="scope">
                   {{ scope.row.姓名 }}
                 </template>
               </el-table-column>
-        <el-table-column label="领料单备注" align="center" min-width="130">
+              <el-table-column label="领料单备注" align="center" min-width="120" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.领料单备注 }}
                 </template>
               </el-table-column>
-        <el-table-column label="审批" align="center" min-width="90">
+              <el-table-column label="审批" align="center" width="100">
                 <template slot-scope="scope">
                   <el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
                   <el-tag v-if="Number(scope.row.是否审批)===0 && Number(token)!==21 && Number(token)!==36 && Number(token)!==37" type="warning">未审批</el-tag>
                   <el-button v-if="Number(scope.row.是否审批)===0 && (Number(token)===21 || Number(token)===36 || Number(token)===37)" size="mini" type="primary" plain icon="el-icon-check" @click="approvalPass(scope.row)">审批</el-button>
-            <el-button v-if="Number(scope.row.是否审批)===2 && (Number(token)===21 || Number(token)===36 || Number(token)===37)" size="mini" type="danger" plain icon="el-icon-check" @click="approvalPass(scope.row)">未通过</el-button>
                 </template>
               </el-table-column>
             </el-table>
-      <div class="block" style="float:right;margin: 10px 0;">
+          </el-card>
-        <el-pagination
+        </el-col>
-          :current-page="pageCurrent3"
+        <el-col style="width: 58%">
-          :page-sizes="[10, 20, 30, 40]"
+          <el-card>
-          :page-size="pageSize3"
+            <!--<h4>领料单明细：{{ pickingListNumberShow }}</h4>-->
-          :total="total3"
+            <el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="600">
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange3"
-          @current-change="handleCurrentChange3"/>
-      </div>
-      <h4>领料单明细：{{ pickingListNumberShow }}</h4>
-      <el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300">
               <el-table-column label="序号" align="center" type="index" width="50"/>
               <el-table-column label="名称" align="center" min-width="100">
                 <template slot-scope="scope">
@@ -66,16 +62,16 @@
                   {{ scope.row.规格 || '—' }}
                 </template>
               </el-table-column>
-        <el-table-column label="机床图号" align="center" min-width="100">
+              <!--<el-table-column label="机床图号" align="center" min-width="100">-->
-          <template slot-scope="scope">
+              <!--<template slot-scope="scope">-->
-            {{ scope.row.机床图号 }}
+              <!--{{ scope.row.机床图号 }}-->
-          </template>
+              <!--</template>-->
-        </el-table-column>
+              <!--</el-table-column>-->
-        <el-table-column label="组号" align="center" min-width="70">
+              <!--<el-table-column label="组号" align="center" min-width="70">-->
-          <template slot-scope="scope">
+              <!--<template slot-scope="scope">-->
-            {{ scope.row.组号 }}
+              <!--{{ scope.row.组号 }}-->
-          </template>
+              <!--</template>-->
-        </el-table-column>
+              <!--</el-table-column>-->
               <el-table-column label="总数量" align="center" min-width="70">
                 <template slot-scope="scope">
                   {{ scope.row.领用数量 }}
@@ -88,30 +84,24 @@
               </el-table-column>
             </el-table>
           </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="领料单审批" center style="min-height: 300px;" width="380px">
+        </el-col>
-      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
+      </el-row>
-        <el-form-item label="审批是否通过" prop="审批是否通过" center>
+      <div class="block" style="float:left; margin: 0px;">
-          <el-select v-model="form2.审批是否通过" size="small" @change="selectChange">
+        <el-pagination
-            <el-option
+          :current-page="pageCurrent3"
-              v-for="item in approval"
+          :page-sizes="[10, 20, 30, 40]"
-              :key="item.value"
+          :page-size="pageSize3"
-              :label="item.label"
+          :total="total3"
-              :value="item.value"/>
+          layout="total, sizes, prev, pager, next, jumper"
-          </el-select>
+          @size-change="handleSizeChange3"
-        </el-form-item>
+          @current-change="handleCurrentChange3"/>
-        <el-form-item label="未通过原因" prop="未通过原因">
-          <el-input v-model="form2.未通过原因" :disabled="disabled" size="small"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :disabled="Open_disable" type="primary" size="small" @click="submitApproval('form2')">确定</el-button>
       </div>
-    </el-dialog>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail, submitApproval } from '@/api/Inventory/CreatePickingList'
+import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail } from '@/api/Inventory/CreatePickingList'
 import request from '@/utils/request'
 import { mapGetters } from 'vuex'
 export default {
@@ -119,15 +109,6 @@ export default {
   data() {
     return {
       PartType: '基本件',
-      Open_disable: false,
-      dialogVisible3: false,
-      form2: {
-        审批是否通过: 1,
-        未通过原因: ''
-      },
-      rules2: {
-        审批是否通过: [{ required: true, message: '请选择', trigger: 'change' }]
-      },
       machineNumberValue: '',
       machineNumber: [],
       groupNumberValue: '',
@@ -149,17 +130,6 @@ export default {
       pageSize3: 20,
       total3: 0,
       pickListTable2: [],
-      approval: [
-        {
-          value: 1,
-          label: '是'
-        },
-        {
-          value: 2,
-          label: '否'
-        }
-      ],
-      disabled: true,
       dialogFormVisible1: false,
       form1: {
         领料人流水号: '',
@@ -189,28 +159,37 @@ export default {
   methods: {
     // 审批通过
     approvalPass(row) {
-      this.form2.审批是否通过 = 1
+      this.$confirm('是否审批通过?', '提示', {
-      this.form2.未通过原因 = ''
+        confirmButtonText: '确定',
-      this.disabled = true
+        cancelButtonText: '取消',
-      this.pickingListNum = row.领料单流水号
+        type: 'warning'
-      this.Open_disable = false
+      }).then(() => {
-      this.dialogVisible3 = true
+        if (this.pickListTable2.length === 0) {
-    },
+          this.$message.error('不能审批空领料单')
-    submitApproval(formName) {
+          return
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.Open_disable = true
-          submitApproval(this.pickingListNum, this.form2.审批是否通过, this.form2.未通过原因).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('审批成功')
-              this.dialogVisible3 = false
-              this.searchList()
-            } else { this.$message.error('审批失败') }
-          })
-        } else {
-          console.log('error submit!!')
-          return false
         }
+        const param = {
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `update 车间装配管理_领料单 set 是否审批 = 1 where 领料单流水号 = ${row.领料单流水号}`
+          }
+        }
+        request(param).then(res => {
+          if (res.data[0].result === '1') {
+            this.$message.success('操作成功')
+            this.pickingListNumber = ''
+            this.searchList()
+          } else {
+            this.$message.error('操作失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
       })
     },
     // 初始化数据
@@ -407,13 +386,6 @@ export default {
         })
       })
     },
-    selectChange() {
-      if (this.form2.审批是否通过 === 2) {
-        this.disabled = false
-      } else if (this.form2.审批是否通过 === 1) {
-        this.disabled = true
-      }
-    },
     // 多选
     handleSelectionChange(val) {
       this.multipleSelection = val

src/views/Inventory/PurchasePartsStorage/index.vue

@@ -56,7 +56,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div>共{{ totallength }}条信息，选择{{ length }}条</div>
+      <div style="font-size: 5px">共{{ totallength }}条信息，选择{{ length }}条</div>
       <span v-show="false">仓库名称：</span>
       <el-select v-show="false" v-model="inventoryNumber" style="width: 200px" filterable size="small" placeholder="仓库名称" @change="getLocate">
         <el-option
@@ -174,9 +174,9 @@ export default {
             type: '3',
             name: `select distinct 供应商流水号,供应商名称 from (
               select 供应商流水号,供应商名称,sum(数量) as 总采购数量,sum(已到货数量) as 总到货数量
-              from 库存管理_外购件_采购合同明细_视图
+              from 库存管理_外购件_采购合同明细_视图 where 是否启用 = 1
               group by 采购合同流水号,供应商流水号,供应商名称
-              having sum(数量) <> sum(已到货数量)
+              having sum(数量) > sum(已到货数量)
               ) as 已采购的离线合同`
           }
         }
@@ -197,9 +197,9 @@ export default {
             type: '3',
             name: `select distinct 供应商流水号,供应商名称 from (
               select 供应商流水号,供应商名称,sum(数量) as 总采购数量,sum(已到货数量) as 总到货数量
-              from 库存管理_车间采购_视图
+              from 库存管理_车间采购_视图 where 是否启用 = 1
               group by 采购合同流水号,供应商流水号,供应商名称
-              having sum(数量) <> sum(已到货数量)
+              having sum(数量) > sum(已到货数量)
               ) as 已采购的离线合同`
           }
         }
@@ -222,7 +222,7 @@ export default {
               select 供应商流水号,供应商名称,sum(数量) as 总采购数量,sum(到货数量) as 总到货数量
               from 车间采购管理_离线合同明细_视图
               group by 离线合同流水号,供应商流水号,供应商名称
-              having sum(数量) <> sum(到货数量)
+              having sum(数量) > sum(到货数量)
               ) as 已采购的离线合同`
           }
         }

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -32,7 +32,7 @@
         :data="tableData"
         :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
         height="760"
-        style="width: 1110px; margin: 3px 0"
+        style="width: 1015px; margin: 3px 0"
         size="mini"
         border
         stripe
@@ -87,11 +87,11 @@
             {{ scope.row.备料任务接受时间 | formatTime }}
           </template>
         </el-table-column>
-        <el-table-column label="分配时间" align="center" width="90" show-overflow-tooltip>
+        <!--<el-table-column label="分配时间" align="center" width="90" show-overflow-tooltip>-->
-          <template slot-scope="scope">
+        <!--<template slot-scope="scope">-->
-            {{ scope.row.备料任务分配时间 | formatTime }}
+        <!--{{ scope.row.备料任务分配时间 | formatTime }}-->
-          </template>
+        <!--</template>-->
-        </el-table-column>
+        <!--</el-table-column>-->
       </el-table>
       <div class="block">
         <el-pagination

src/views/PurchasingCenter/MaterialMProcure/index.vue

@@ -83,7 +83,7 @@
           size="small"
           style="margin-left: 10px"
           @click="pageCurrent=1;searchMaterial()">查询</el-button>
-        <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">采购物料申请</el-button>
+        <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">物料申请</el-button>
       </el-row>
       <el-row>
         <el-input v-model="MaterialName" placeholder="物料名称/物料规格/物料型号" style="width: 220px" size="small" clearable/>
@@ -102,7 +102,7 @@
         <!--<el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable/>-->
         <!--<el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable/>-->
         <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;PageSize = 30;searchMaterial()">查询</el-button>
-        <el-button type="warning" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" plain size="small" @click="handleAdd()">采购物料申请</el-button>
+        <el-button type="warning" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" plain size="small" @click="handleAdd()">物料申请</el-button>
       </el-row>
     </el-card>