仓库

2019-11-28 15:43:17 +08:00
parent 998a73603b
commit 5f5451c225
4 changed files with 40 additions and 50 deletions
--- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js
+++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
@@ -97,30 +97,6 @@ export function getTable00(PageCurrent, PageSize, num) {
    }
  })
 }
-// 保存
-export function save(num1, num2, num3) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理工艺_工艺任务分配_保存数据',
-      param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
-    }
-  })
-}
-// // 模糊查询
-// export function fuzzyQuery(num) {
-//   return request({
-//     url: '',
-//     method: 'post',
-//     data: {
-//       type: '1',
-//       name: '车间生产管理工艺_传递后_机床名称_查询数据_模糊查询',
-//       param: '机床图号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1'
-//     }
-//   })
-// }
 // 工艺定额人员查询
 export function initPerson() {
  return request({
@@ -134,6 +110,18 @@ export function initPerson() {
  })
 }
 // 保存
+export function save(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_工艺任务分配_保存数据',
+      param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
+    }
+  })
+}
+// 保存
 export function save2(num1, num2, num3) {
  return request({
    url: '',
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -6,13 +6,13 @@
          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 150px;" @keyup.enter.native="pageCurrent=1;pageSize=20;searchMaterial()"/>
          <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
          <!--<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
-          <el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
-            <el-option
-              v-for="item in inventoryName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
+          <!--<el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">-->
+          <!--<el-option-->
+          <!--v-for="item in inventoryName"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
          <el-select v-model="locateNameValue" placeholder="货位名称" style="margin-top: 10px; width: 120px;" size="small" clearable>
            <el-option
              v-for="item in locateName"
@@ -85,18 +85,18 @@

    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">
      <el-row>
-        <el-col style="width: 240px">
-          <span>物料名称:</span>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
-        </el-col>
-        <el-col style="width: 240px">
-          <span>物料规格:</span>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
-        </el-col>
-        <el-col style="width: 240px">
-          <span>物料型号:</span>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
+        <el-col style="width: 280px">
+          <span>名称规格型号:</span>
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;" @keyup.enter.native="pageCurrent01=1;pageSize01=20;searchMaterial01()"/>
        </el-col>
+        <!--<el-col style="width: 240px">-->
+        <!--<span>物料规格:</span>-->
+        <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
+        <!--</el-col>-->
+        <!--<el-col style="width: 240px">-->
+        <!--<span>物料型号:</span>-->
+        <!--<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
+        <!--</el-col>-->
        <el-col style="width: 80px">
          <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button>
        </el-col>
@@ -134,7 +134,7 @@
          @current-change="handleCurrentChange01"/>
      </div><hr>
      <el-row>
-        <el-col style="width: 210px">
+        <el-col v-show="false" style="width: 210px">
          <span>仓库:</span>
          <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">
            <el-option
@@ -206,6 +206,7 @@ export default {
  mounted() {
    this.initData()
    this.searchMaterial()
+    this.getLocate()
  },
  methods: {
    // 初始化数据
@@ -236,8 +237,7 @@ export default {
        method: 'post',
        data: {
          type: '1',
-          name: '库存管理_货位主文件_查询数据',
-          param: `仓库流水号=${this.inventoryNameValue}`
+          name: '库存管理_货位主文件_查询数据_2019-11-28'
        }
      }
      request(param).then(res => {
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -436,9 +436,9 @@ export default {
    },
    // 领料确认
    inputPassword() {
-      this.form3.outTypeValue = ''
+      this.form3.outTypeValue = 21
      this.form3.password = ''
-      this.form3.department = ''
+      this.form3.department = '装配'
      this.dialogFormVisible3 = true
    },
    selectable(row, index) { // 控制某行是否可选
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -169,7 +169,7 @@
        <!--:value="item.value"/>-->
        <!--</el-select>-->
        <!--</el-form-item>-->
-        <el-form-item label="领料部门" prop="DirectNumber" label-width="100px" size="small">
+        <el-form-item label="领料部门" prop="department" label-width="100px" size="small">
          <el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>
        </el-form-item>
        <el-form-item label="领料人" prop="DirectNote" label-width="100px">
@@ -220,7 +220,8 @@ export default {
          { required: true, message: '请输入数量', trigger: 'blur' },
          { validator: checkNum, trigger: 'blur' }
        ],
-        DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }]
+        DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }],
+        department: [{ required: true, message: '请输入领料部门', trigger: 'blur' }]
      },
      locateNumber: '',
      materialNumber: '',
@@ -346,12 +347,13 @@ export default {
    },
    // 打开表单
    parOut(row) {
-      this.dialogFormVisible = true
+      this.form.department = '装配车间'
      this.locateNumber = row.货位流水号
      this.materialNumber = row.物料流水号
      this.partnumber = row.货位存量
      this.离线合同明细流水号 = row.离线合同明细流水号
      this.组件零件基本件流水号 = row.组件零件基本件流水号
+      this.dialogFormVisible = true
    },
    // 重置表单
    callOff() {