更新

2020-03-11 18:09:35 +08:00
parent b6c062607f
commit c099ccf0be
14 changed files with 312 additions and 140 deletions
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -2,8 +2,10 @@
  <div class="app-container">
    <el-card>
      <el-row>
-        <el-col style="margin-top: 3px;width: 150px;margin-left: 10px">
+        <el-col style="margin-top: 3px;width: 180px;margin-left: 10px">
+          <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable style="width: 170px"/>
          <el-select
+            v-show="false"
            v-model="MaterialCategoryValue"
            placeholder="物料类别"
            size="small"
@@ -17,8 +19,15 @@
              :value="item.value"/>
          </el-select>
        </el-col>
-        <el-col style="margin-top: 3px;width: 150px;margin-left: 10px">
+        <el-col style="margin-top: 3px;width: 190px">
+          <el-input
+            v-model="MaterialSpecification"
+            placeholder="物料规格"
+            size="small"
+            clearable
+            style="width: 190px"/>
          <el-select
+            v-show="false"
            v-model="MaterialVarietyValue"
            placeholder="物料品种"
            size="small"
@@ -32,32 +41,42 @@
              :value="item.value"/>
          </el-select>
        </el-col>
-        <el-col style="margin-top: 3px;width: 180px;margin-left: 10px">
-          <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable style="width: 170px"/>
-        </el-col>
-        <el-col style="margin-top: 3px;width: 180px;margin-left: 10px">
-          <el-input
-            v-model="FullNameOfMaterial"
-            placeholder="物料全称"
-            size="small"
-            clearable
-            style="width: 170px"/>
-        </el-col>
-        <el-col style="margin-top: 3px;width: 200px;margin-left: 10px">
-          <el-input
-            v-model="MaterialSpecification"
-            placeholder="物料规格"
-            size="small"
-            clearable
-            style="width: 190px"/>
-        </el-col>
-        <el-col style="margin-top: 3px;width: 200px;margin-left: 10px">
+        <el-col style="margin-top: 3px;width: 190px;margin-left: 10px">
          <el-input
            v-model="MaterialModel"
            placeholder="物料型号"
            size="small"
            clearable
            style="width: 190px"/>
+          <el-input
+            v-show="false"
+            v-model="FullNameOfMaterial"
+            placeholder="物料全称"
+            size="small"
+            clearable
+            style="width: 170px"/>
+        </el-col>
+        <el-col style="margin-top: 3px;width: 250px;margin-left: 10px">
+          <el-select
+            v-model="GonghuoshangValue"
+            placeholder="供货商"
+            filterable
+            style="width: 140px"
+            size="small"
+            clearable>
+            <el-option
+              v-for="item in Gonghuoshang"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="small"
+            plain
+            @click="pageCurrent=1;searchMaterial()">查询
+          </el-button>
        </el-col>
      </el-row>
      <!--<el-col style="width: 280px">-->
@@ -78,6 +97,7 @@
      <el-row>
        <el-col style="width: 150px;margin-left: 10px">
          <el-select
+            v-show="false"
            v-model="MaterialSourceValue"
            placeholder="物料来源"
            style="margin-bottom: 3px;margin-top: 10px;width: 140px"
@@ -91,19 +111,6 @@
          </el-select>
        </el-col>
        <el-col style="width: 150px;margin-left: 10px">
-          <el-select
-            v-model="GonghuoshangValue"
-            placeholder="供货商"
-            filterable
-            style="margin-bottom: 3px;margin-top: 10px;width: 140px"
-            size="small"
-            clearable>
-            <el-option
-              v-for="item in Gonghuoshang"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
          <!--<el-input-->
          <!--v-model="supplier"-->
          <!--placeholder="供货商"-->
@@ -113,13 +120,6 @@
          <!--@dblclick.native="param=0;openSupplier()"/>-->
        </el-col>
        <el-col style="margin-left: 10px;width: 550px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="small"
-            plain
-            @click="pageCurrent=1;searchMaterial()">查询
-          </el-button>
          <el-button :disabled="parseInt(token) !== 11 && parseInt(token) !== 36" type="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">物料</el-button>
          <el-button
            :disabled="parseInt(token) !== 11 && parseInt(token) !== 36"
@@ -171,7 +171,7 @@
            {{ scope.row.参考价格 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="150">
+        <el-table-column label="操作" fixed="right" align="center" width="110">
          <template slot-scope="scope">
            <el-tooltip :open-delay="1000" effect="dark" content="编辑">
              <div style="display: inline-block">
@@ -518,17 +518,17 @@
          <el-table-column label="操作" fixed="right" align="center" width="150">
            <template slot-scope="scope">
              <div style="display: inline-block">
-                <el-button type="primary" plain size="small" @click="Tongguo(scope.row)">通过</el-button>
+                <el-button type="text" size="small" @click="Tongguo(scope.row)">通过</el-button>
              </div>
              <div style="display: inline-block">
                <el-popover
                  placement="bottom"
-                  width="400"
+                  width="380"
                  trigger="click">
                  <span>打回原因：</span>
-                  <el-input v-model="打回原因" placeholder="打回原因" size="small" clearable/>
-                  <el-button type="danger" size="small" @click="queren()">确认</el-button>
-                  <el-button slot="reference" type="danger" plain size="small" @click="Dahui(scope.row)">打回</el-button>
+                  <el-input v-model="打回原因" :autosize="{ minRows: 1, maxRows: 4}" placeholder="打回原因" size="small" type="textarea" style="width: 200px" clearable/>
+                  <el-button type="danger" size="small" style="margin-left: 10px" @click="queren()">确认</el-button>
+                  <el-button slot="reference" type="text" size="small" @click="Dahui(scope.row)">打回</el-button>
                </el-popover>
              </div>
            </template>
@@ -884,8 +884,24 @@ export default {
      })
    },
    handleDelete(row) { // 删除
-      this.deleteRow(deleteData, row.物料流水号, function() {
-        this.searchMaterial()
+      this.$confirm('删除该物料信息,将不可恢复,是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteData(row.物料流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchMaterial()
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
      })
    },
    CategoryMaintenance() {
--- a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
+++ b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
@@ -3,7 +3,7 @@
    <el-card>
      <el-table :data="tableData1" :cell-style="changeCellStyle" highlight-current-row height="810" style="width: 100%;" size="mini" border>
        <el-table-column label="序号" type="index" align="center" width="50"/>
-        <el-table-column label="项目名称" align="center" width="200px">
+        <el-table-column label="机床名称" align="center" width="200px">
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
          </template>
@@ -13,6 +13,11 @@
            {{ scope.row.申请人姓名 }}
          </template>
        </el-table-column>
+        <el-table-column label="申请时间" align="center" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间.split(' ')[0] }}
+          </template>
+        </el-table-column>
        <el-table-column label="原物料名称" align="center" min-width="150px">
          <template slot-scope="scope">
            {{ scope.row.原物料名称 }}
@@ -43,7 +48,7 @@
            {{ scope.row.新物料型号 }}
          </template>
        </el-table-column>
-        <el-table-column label="审核" width="200px" align="center" fixed="right">
+        <el-table-column label="审核" width="150px" align="center" fixed="right">
          <template slot-scope="scope">
            <el-button
              size="mini"