技术中心

2019-02-19 09:08:44 +08:00
parent a8207be227
commit 83516538ca
5 changed files with 225 additions and 95 deletions
--- a/src/api/TechnologyCenter/CreatePackingList.js
+++ b/src/api/TechnologyCenter/CreatePackingList.js
@@ -184,7 +184,7 @@ export function getSpareData(num) {
    data: {
      type: '1',
      name: 'PDM_装箱单_备件_查询数据',
-      param: `装箱单编号=${num}`
+      param: `项目流水号=${num}&机床流水号=${num}`
    }
  })
 }
@@ -201,26 +201,26 @@ export function deleteSpareData(num) {
  })
 }

-export function editSpareData(name, specification, unit, number, remark, num) {
+export function editSpareData(MapNumber, name, specification, unit, number, remark, num) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: 'PDM_装箱单_备件_修改数据',
-      param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}`
+      param: `图号=${MapNumber}&名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&备件编号=${num}`
    }
  })
 }

-export function addSpareData(name, specification, unit, number, remark, num) {
+export function addSpareData(MapNumber, name, specification, unit, number, remark, num, num1, num2) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: 'PDM_装箱单_备件_增加数据',
-      param: `名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&装箱单编号=${num}`
+      param: `图号=${MapNumber}&名称=${name}&规格=${specification}&数量=${number}&单位=${unit}&备注=${remark}&装箱单编号=${num}&项目流水号=${num1}&机床流水号=${num2}`
    }
  })
 }
--- a/src/api/TechnologyCenter/ImportParts.js
+++ b/src/api/TechnologyCenter/ImportParts.js
@@ -242,18 +242,6 @@ export function searchMachine(project) {
    }
  })
 }
-
-export function searchMachine2(project) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_零件明细表_外购件和标准件_数据导入保存_机床_查询数据gj',
-      param: `项目=${project}`
-    }
-  })
-}
 // 查询组号
 export function searchGroupNum(project, name) {
  return request({
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -18,8 +18,8 @@ const service = axios.create({
  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  // baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
  // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
  timeout: 1500000 // 请求超时时间
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -29,6 +29,7 @@
        :row-class-name="tableRowClassName"
        size="mini"
        border
+        highlight-current-row
        @row-click="searchMaterial1">
        <el-table-column
          label="序号"
@@ -184,20 +185,13 @@
                  :value="item.value"/>
              </el-select>
            </el-form-item>
-            <el-form-item v-if="type === 2" label="材料" prop="材料">
-              <el-input v-model="form.物料名称" clearable size="small" style="width: 200px;" placeholder="物料流水号" @dblclick.native="materialShow"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="规格" prop="规格">
+            <el-form-item v-if="type === 2" label="规格" prop="规格">
              <el-input
                v-model="form.规格"
                size="small"
                style="width: 200px;"/>
            </el-form-item>
          </el-col>
-        </el-row>
-        <el-row>
          <el-col :span="12">
            <el-form-item label="备件数量" prop="数量">
              <el-input
@@ -206,6 +200,8 @@
                style="width: 200px;"/>
            </el-form-item>
          </el-col>
+        </el-row>
+        <el-row>
          <el-col :span="12">
            <el-form-item label="装机数量" prop="数量">
              <el-input
@@ -214,8 +210,6 @@
                style="width: 200px;"/>
            </el-form-item>
          </el-col>
-        </el-row>
-        <el-row>
          <el-col :span="12">
            <el-form-item label="部件数量" prop="数量">
              <el-input
@@ -224,6 +218,8 @@
                style="width: 200px;"/>
            </el-form-item>
          </el-col>
+        </el-row>
+        <el-row>
          <el-col :span="12">
            <el-form-item label="制造商" prop="供货商">
              <el-input
@@ -232,8 +228,6 @@
                style="width: 200px;"/>
            </el-form-item>
          </el-col>
-        </el-row>
-        <el-row>
          <el-col :span="12">
            <el-form-item label="分类码" prop="分类码">
              <el-input
@@ -242,6 +236,8 @@
                style="width: 200px;"/>
            </el-form-item>
          </el-col>
+        </el-row>
+        <el-row>
          <el-col :span="12">
            <el-form-item label="备注" prop="备注">
              <el-input
@@ -258,52 +254,6 @@
        <el-button v-show="title==='编辑零件信息'" type="primary" @click="submitEdit()">确定</el-button>
      </div>
    </el-dialog>
-
-    <el-dialog :visible.sync="dialogMaterial" title="物料选择">
-      <el-input v-model="inputMaterial" placeholder="材质" size="small" style="width:200px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="searchMaterial()">查询</el-button>
-      <el-table
-        :data="MaterialData"
-        size="mini"
-        highlight-current-row
-        border
-        @row-click="selectMaterial">
-        <el-table-column align="center" label="物料代码">
-          <template slot-scope="scope">
-            {{ scope.row.物料代码 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料名称">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料规格">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料型号">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrentMaterial"
-          :page-sizes="[10, 20]"
-          :page-size="pageSizeMaterial"
-          :total="totalMaterial"
-          small
-          layout="sizes, prev, pager, next"
-          @size-change="handleSizeChangeMaterial"
-          @current-change="handleCurrentChangeMaterial"/>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogMaterial=false">提交</el-button>
-      </div>
-    </el-dialog>
  </div>
 </template>

@@ -361,7 +311,6 @@ export default {
      },
      err: 0,
      dialogFormVisibleWB: false,
-      dialogMaterial: false,
      MaterialData: [],
      inputMaterial: '',
      rules: {
@@ -557,22 +506,12 @@ export default {
        console.log(response.data)
      })
    },
-    materialShow() {
-      this.inputMaterial = ''
-      this.getMaterialWB()
-      this.dialogMaterial = true
-    },
    getMaterialWB() {
      this.getTable(getMaterialWB, [this.pageCurrentMaterial, this.pageSizeMaterial], ['MaterialData', 'totalMaterial', 'loadingMaterial'])
    },
    searchMaterial() {
      this.getTable(searchMaterialWB, [this.inputMaterial, this.pageCurrentMaterial, this.pageSizeMaterial], ['MaterialData', 'totalMaterial', 'loadingMaterial'])
    },
-    selectMaterial(row) {
-      this.dialogMaterial = false
-      this.form.物料流水号 = row.物料流水号
-      this.form.物料名称 = row.物料名称
-    },
    handleSizeChange(val) {
      this.pageCurrent = 1
      this.pageSize = val