初次投产，工艺任务分配

src/api/ManufacturingCenter/InitialProduction.js

@@ -13,14 +13,14 @@ export function getEntryNameValue() {
   })
 }
 // 机床名称
-export function getToolNum(num) {
+export function getToolNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
-      param: '项目流水号=' + num + '=int&是否传递=1=int'
+      param: '是否传递=1'
     }
   })
 }

src/api/ManufacturingCenter/ProcessTaskAssignment.js

@@ -24,14 +24,14 @@ export function getProject0() {
   })
 }
 // 获取机床图号（全部）
-export function getGraphNum(num) {
+export function getGraphNum() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_查询数据',
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
-      param: '项目流水号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
+      param: '是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
     }
   })
 }

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -11,26 +11,20 @@
               <el-radio :label="1">整改件投产</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="项目名称" style="margin-top:28px">
+          <el-form-item label="机床号" style="margin-top:28px">
-            <el-select v-model="entryNameValue" filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
+            <el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床号" @change="typeChange1()">
-              <el-option
-                v-for="item in entryName"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="机床号">
-            <el-select v-model="toolNumValue" filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
               <el-option
                 v-for="item in toolNum"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value"/>
+                :value="item.value">
+                <div style="float: left">{{ item.label }}</div>
+                <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+              </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="机床组号">
+          <el-form-item label="分组">
-            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
+            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组">
               <el-option
                 v-for="item in Num"
                 :key="item.value"
@@ -434,7 +428,7 @@ export default {
     ])
   },
   created() {
-    this.fetchData()
+    this.typeChange()
     this.getCurrentTime()
     this.getNowTime()
   },
@@ -505,15 +499,14 @@ export default {
       })
     },
     typeChange() {
-      this.toolNumValue = ''
-      this.toolNum = []
       this.NumValue = ''
       this.Num = []
-      getToolNum(this.entryNameValue).then(response => {
+      getToolNum().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.toolNum.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
           })
         }
       })

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -5,34 +5,19 @@
         <el-radio :label="1">当天</el-radio>
         <el-radio :label="2">全部</el-radio>
       </el-radio-group>
-      <span>项目名称:</span>
-      <el-select
-        v-loading="loading"
-        v-model="projectNameValue"
-        element-loading-text="拼命加载中"
-        element-loading-spinner="el-icon-loading"
-        filterable
-        clearable
-        size="small"
-        placeholder="请选择项目名称"
-        style="width: 200px;margin-right:10px"
-        @change="getGraphNum()">
-        <el-option
-          v-for="item in projectName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床图号:</span>
-      <el-select v-model="graphNumValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="getGroupNum()">
+      <el-select v-model="graphNumValue" filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
         <el-option
           v-for="item in graphNum"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+        </el-option>
       </el-select>
       <span>组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
+      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
         <el-option
           v-for="item in GroupNum"
           :key="item.value"
@@ -168,7 +153,7 @@ export default {
     }
   },
   created() {
-    this.fetchData()
+    this.getGraphNum()
     this.initPerson()
   },
   methods: {
@@ -221,16 +206,15 @@ export default {
     getGraphNum() { // 获取下拉图号
       this.tableData = []
       this.total = 0
-      this.graphNum = []
-      this.graphNumValue = ''
       this.GroupNumValue = ''
       this.GroupNum = []
       if (this.radio === 2) { // 全部
-        getGraphNum(this.projectNameValue).then(response => {
+        getGraphNum().then(response => {
           for (let i = 0; i < response.data.length; i++) {
             this.graphNum.push({
               label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
+              value: response.data[i].机床流水号,
+              value2: response.data[i].项目名称
             })
           }
         })