color

2018-11-19 16:31:00 +08:00
parent 59e74eb1a1 45d3903a22
commit 7222385e98
31 changed files with 1048 additions and 460 deletions
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -4,13 +4,11 @@
      <span>项目名称:</span>
      <el-select
        v-model="entryNameValue"
-        :remote-method="remoteMethod"
        placeholder="项目名称"
        style="width:200px"
        size="small"
        clearable
        filterable
-        remote
        @change="empty">
        <el-option
          v-for="item in entryName"
@@ -19,9 +17,9 @@
          :value="item.value"/>
      </el-select>
      <span>机床号:</span>
-      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
+      <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
      <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="组号" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
+      <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
      <span>年:</span>
      <el-date-picker
        v-model="year"
@@ -155,7 +153,9 @@
          @size-change="handleSizeChange1"
          @current-change="handleCurrentChange1"/>
      </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitName">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitName">提交</el-button>
+      </div>
    </el-dialog>

    <el-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
@@ -202,7 +202,9 @@
          @size-change="handleSizeChange3"
          @current-change="handleCurrentChange3"/>
      </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitGroup">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitGroup">提交</el-button>
+      </div>
    </el-dialog>
  </div>
 </template>
@@ -238,7 +240,6 @@ export default {
      title: '',
      dialogFormVisible2: false,
      dialogFormVisible3: false,
-      List: [],
      check: null,
      check1: null,
      check2: null,
@@ -289,8 +290,6 @@ export default {
    }
  },
  created() {
-  },
-  mounted() {
    this.getList()
  },
  methods: {
@@ -346,30 +345,15 @@ export default {
      }
    },
    getList() { // 初始化项目名称
-      this.list = []
      initProject().then(response => {
        for (let i = 0; i < response.data.length; i++) {
-          this.list.push({
+          this.entryName.push({
            label: response.data[i].项目名称,
            value: response.data[i].项目流水号
          })
        }
      })
    },
-    remoteMethod(query) {
-      if (query !== '') {
-        setTimeout(() => {
-          this.entryName = this.list.filter(item => {
-            if (item.label !== null) {
-              return item.label.toLowerCase()
-                .indexOf(query.toLowerCase()) > -1
-            }
-          })
-        }, 1000)
-      } else {
-        this.entryName = []
-      }
-    },
    empty() {
      this.machineToolNumber = ''
      this.groupNumber = ''
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -299,7 +299,7 @@
            style="width:200px"/>
        </el-form-item>

-        <el-form-item label="请购人" prop="请购人">
+        <el-form-item label="请购人">
          <el-input
            v-model="name"
            size="small"
@@ -496,6 +496,12 @@ export default {
        this.check4 = 0
      }
      searchTable1(this.PurchaseOrder, this.check4).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          console.log(response.data[i].请购时间)
+          if (response.data[i].请购时间 !== '') {
+            response.data[i].请购时间 = (response.data[i].请购时间).split(' ')[0]
+          }
+        }
        this.tableData4 = response.data
      })
    },
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -5,13 +5,11 @@
      <span>项目名称:</span>
      <el-select
        v-model="entryNameValue"
-        :remote-method="remoteMethod"
        placeholder="项目名称"
        style="width:200px"
        size="small"
        clearable
        filterable
-        remote
        @change="empty">
        <el-option
          v-for="item in entryName"
@@ -20,6 +18,7 @@
          :value="item.value"/>
      </el-select>
      <span>机床号:</span>
+<<<<<<< HEAD
      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
        <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
      </el-input>
@@ -27,6 +26,11 @@
      <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
        <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
      </el-input>
+=======
+      <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
+      <span>组号:</span>
+      <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
+>>>>>>> 45d3903a226c57546658abf8697edd180bd01975
      <span>零件号:</span>
      <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
      <br>
@@ -191,7 +195,9 @@
          @size-change="handleSizeChange1"
          @current-change="handleCurrentChange1"/>
      </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitName">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitName">提交</el-button>
+      </div>
    </el-dialog>

    <el-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
@@ -238,7 +244,9 @@
          @size-change="handleSizeChange3"
          @current-change="handleCurrentChange3"/>
      </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitGroup">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitGroup">提交</el-button>
+      </div>
    </el-dialog>

  </div>
@@ -311,8 +319,6 @@ export default {
  },
  created() {
    this.fetchData()
-  },
-  mounted() {
    this.getList()
  },
  methods: {
@@ -372,28 +378,15 @@ export default {
      })
    },
    getList() { // 初始化项目名称
-      this.list = []
      initProject().then(response => {
        for (let i = 0; i < response.data.length; i++) {
-          this.list.push({
+          this.entryName.push({
            label: response.data[i].项目名称,
            value: response.data[i].项目流水号
          })
        }
      })
    },
-    remoteMethod(query) {
-      if (query !== '') {
-        setTimeout(() => {
-          this.entryName = this.list.filter(item => {
-            return item.label.toLowerCase()
-              .indexOf(query.toLowerCase()) > -1
-          })
-        }, 1000)
-      } else {
-        this.entryName = []
-      }
-    },
    empty() {
      this.machineToolNumber = ''
      this.groupNumber = ''
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -253,6 +253,7 @@ export default {
      this.form.设备型号 = row.设备型号
      this.form.设备性能指标 = row.设备性能指标
      this.form.设备加工能力 = row.设备加工能力工时
+      this.form.设备加工工艺 = parseInt(row.工艺属性代码)
      this.form.班次类型 = row.班次类型
      this.form.设备工时系数 = row.设备工时系数
      this.form.整改工时系数 = row.整改工时比例