Merge pull request '定单' (#138) from liwei into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT/pulls/138
Reviewed-by: wangxy <xinyao.wang@le-it.com.cn>

src/api/productplan/base.js

@@ -48,6 +48,14 @@ export function getArticleData (query) {
 		method: 'get'
 	})
 }
+export function getSelectallcarmodel (params) {
+	return request({
+		url: '/admin/base/article/selectallcarmodel',
+		method: 'get',
+		params
+	})
+}
+
 
 // 新增
 export function addWorkorder (data) {

src/views/plant/material/part.vue

@@ -48,6 +48,9 @@
 					<span v-else-if="item ==='Article-ArtSpec1'">
 						{{ artSpec1Text(scope.row[item]) }}
 					</span>
+          <span v-else-if="item ==='Article-Status'">
+						{{ statusText(scope.row[item]) }}
+					</span>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
@@ -232,6 +235,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="getColumnName('Article-Version')" prop="Article-Version">
+              <el-input
+                v-model="form['Article-Version']"
+                placeholder="请输入"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <!-- 描述1 -->
             <el-form-item :label="getColumnName('Article-Descr1')">
@@ -523,6 +534,11 @@ export default {
     this.getAtatusArrayList();
   },
   methods: {
+    // 物料状态中文映射
+    statusText(value){
+      const item=this.statusArray.find(e=> e['stdeftab-stdeftyp'] == value);
+			return item?item['stdeftab-bez'] : value
+    },
 		// 物料类型中文映射
 		artSpec1Text(value){
 			const item=this.artSpecList.find(e=> e['stdeftab-stdeftyp'] == value);
@@ -531,7 +547,7 @@ export default {
     // 物料状态列表
 		getAtatusArrayList(){
 			this.getStanderOne({ statid: 'Article-Status' }).then(({data=[]}) => {
-				this.statusArray=data.map(()=>{
+				this.statusArray=data.map((e)=>{
           e['stdeftab-stdeftyp']= Number(e['stdeftab-stdeftyp']);
           return e;
         });
@@ -631,6 +647,8 @@ export default {
             'Article-ArtTypeId',
             'Article-ProjectId',
 						'Article-CustArtId',
+            'Article-Status',
+            'Article-Version',
 						'Article-AlternativeArtId',
 						'Article-UomId',
 						'Article-QuantityPerHour',

src/views/productplan/workbench/order.vue

@@ -1,317 +1,511 @@
 <template>
   <div class="app-container">
     <el-form ref="queryForm" :model="queryParams" :inline="true">
-			<el-form-item :label="getColumnName('OM_WorkOrder-WorkOrderId')">
+      <el-form-item :label="getColumnName('OM_WorkOrder-WorkOrderId')">
         <el-input
           v-model.trim="queryParams.WorkOrderId"
           placeholder="请输入查询内容"
           clearable
           size="small"
-          style="width: 200px"/>
+          style="width: 200px"
+        />
       </el-form-item>
-			<el-form-item label="项目">
-				<el-select v-model="queryParams.ProjectId" clearable filterable placeholder="请选择" style="width:100%;">
-					<el-option
-						v-for="item in projectArray"
-						:key="item['ME_Project-ProjectId']"
-						:label="item['ME_Project-Descr']"
-						:value="item['ME_Project-ProjectId']"
-					/>
-				</el-select>
-			</el-form-item>
-			<el-form-item :label="getColumnName('OM_WorkOrder-ArtId')">
+      <el-form-item label="项目">
+        <el-select
+          v-model="queryParams.ProjectId"
+          clearable
+          filterable
+          placeholder="请选择"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in projectArray"
+            :key="item['ME_Project-ProjectId']"
+            :label="item['ME_Project-Descr']"
+            :value="item['ME_Project-ProjectId']"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="getColumnName('OM_WorkOrder-ArtId')">
         <el-input
           v-model.trim="queryParams.ArtId"
           placeholder="请输入查询内容"
           clearable
           size="small"
-          style="width: 200px"/>
+          style="width: 200px"
+        />
+      </el-form-item>
+      <el-form-item :label="getColumnName('OM_WorkOrder-PlanStartTime')">
+        <el-date-picker
+          v-model="queryParams.start"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择日期时间"
+        />
+      </el-form-item>
+      <el-form-item :label="getColumnName('OM_WorkOrder-PlanEndTime')">
+        <el-date-picker
+          v-model="queryParams.end"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择日期时间"
+        />
+      </el-form-item>
+      <el-form-item :label="getColumnName('OM_WorkOrder-OrderType')">
+        <el-select
+          v-model="queryParams['OrderType']"
+          clearable
+          style="width: 100%"
+          filterable
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in orderTypeArray"
+            :key="item['stdeftab-stdeftyp']"
+            :label="item['stdeftab-bez']"
+            :value="item['stdeftab-stdeftyp']"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="getColumnName('OM_WorkOrderStatus-Status')">
+        <el-select
+          v-model="queryParams['status']"
+          clearable
+          style="width: 100%"
+          filterable
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in orderStatusArray"
+            :key="item['stdeftab-stdeftyp']"
+            :label="item['stdeftab-bez']"
+            :value="item['stdeftab-stdeftyp']"
+          />
+        </el-select>
       </el-form-item>
-			<el-form-item :label="getColumnName('OM_WorkOrder-PlanStartTime')">
-				<el-date-picker
-					v-model="queryParams.start"
-					type="datetime"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					placeholder="选择日期时间"
-				/>
-			</el-form-item>
-			<el-form-item :label="getColumnName('OM_WorkOrder-PlanEndTime')">
-				<el-date-picker
-					v-model="queryParams.end"
-					type="datetime"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					placeholder="选择日期时间"
-				/>
-			</el-form-item>
-			<el-form-item :label="getColumnName('OM_WorkOrder-OrderType')">
-				<el-select v-model="queryParams['OrderType']" clearable style="width:100%;" filterable placeholder="请选择">
-					<el-option
-						v-for="item in orderTypeArray"
-						:key="item['stdeftab-stdeftyp']"
-						:label="item['stdeftab-bez']"
-						:value="item['stdeftab-stdeftyp']"
-					/>
-				</el-select>
-			</el-form-item>
-			<el-form-item :label="getColumnName('OM_WorkOrderStatus-Status')">
-				<el-select v-model="queryParams['status']" clearable style="width:100%;" filterable placeholder="请选择">
-					<el-option
-						v-for="item in orderStatusArray"
-						:key="item['stdeftab-stdeftyp']"
-						:label="item['stdeftab-bez']"
-						:value="item['stdeftab-stdeftyp']"
-					/>
-				</el-select>
-			</el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button
           size="mini"
           type="primary"
           icon="el-icon-plus"
           @click="handleAdd(10)"
-        >内部订单</el-button>
-				<el-button
+          >内部订单</el-button
+        >
+        <el-button
           size="mini"
           type="primary"
           icon="el-icon-plus"
           @click="handleAdd(39)"
-        >返工订单</el-button>
+          >返工订单</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="dataList" border>
-      <el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true" align="center" width="156px">
+      <el-table-column
+        v-for="(item, index) in headers"
+        :key="index"
+        :label="getColumnName(item)"
+        :show-overflow-tooltip="true"
+        align="center"
+        width="156px"
+      >
         <template slot-scope="scope">
-          <span v-if="item === 'OM_WorkOrder-PlantNr'">{{ getValue(scope.row['OM_WorkOrder-PlantNr']) }}</span>
-          <div v-else-if="item === 'OM_WorkOrder-LastModify'"> {{ parseTime(scope.row[item]) }} </div>
-          <div v-else-if="item === 'OM_WorkOrder-CreateTime'"> {{ parseTime(scope.row[item]) }} </div>
-					<div v-else-if="item === 'OM_WorkOrder-PlanStartTime'"> {{ parseTime(scope.row[item]) }} </div>
-					<div v-else-if="item === 'OM_WorkOrder-PlanEndTime'"> {{ parseTime(scope.row[item]) }} </div>
-					<div v-else-if="item === 'OM_WorkOrder-ActStartTime'"> {{ parseTime(scope.row[item]) }} </div>
-					<div v-else-if="item === 'OM_WorkOrder-ActEndTime'"> {{ parseTime(scope.row[item]) }} </div>
-					<div v-else-if="item === 'OM_WorkOrderStatus-Status'" 
-						:class="[colorData[scope.row[item]], 'bg-div']"> {{ fieldTrans(scope.row[item]) }} </div>
-					<div v-else-if="item === 'OM_WorkOrder-OrderType'"> {{ orderTypeTrans(scope.row[item]) }} </div>
+          <span v-if="item === 'OM_WorkOrder-PlantNr'">{{
+            getValue(scope.row['OM_WorkOrder-PlantNr'])
+          }}</span>
+          <div v-else-if="item === 'OM_WorkOrder-LastModify'">
+            {{ parseTime(scope.row[item]) }}
+          </div>
+          <div v-else-if="item === 'OM_WorkOrder-CreateTime'">
+            {{ parseTime(scope.row[item]) }}
+          </div>
+          <div v-else-if="item === 'OM_WorkOrder-PlanStartTime'">
+            {{ parseTime(scope.row[item]) }}
+          </div>
+          <div v-else-if="item === 'OM_WorkOrder-PlanEndTime'">
+            {{ parseTime(scope.row[item]) }}
+          </div>
+          <div v-else-if="item === 'OM_WorkOrder-ActStartTime'">
+            {{ parseTime(scope.row[item]) }}
+          </div>
+          <div v-else-if="item === 'OM_WorkOrder-ActEndTime'">
+            {{ parseTime(scope.row[item]) }}
+          </div>
+          <div
+            v-else-if="item === 'OM_WorkOrderStatus-Status'"
+            :class="[colorData[scope.row[item]], 'bg-div']"
+          >
+            {{ fieldTrans(scope.row[item]) }}
+          </div>
+          <div v-else-if="item === 'OM_WorkOrder-OrderType'">
+            {{ orderTypeTrans(scope.row[item]) }}
+          </div>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="500" fixed="right">
         <template slot-scope="scope">
-					<el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-s-order"
             @click="handleDetails(scope.row)"
-          >明细</el-button>
-					<el-button
+            >明细</el-button
+          >
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-						:disabled="scope.row['OM_WorkOrderStatus-Status'] !== 10"
+            :disabled="scope.row['OM_WorkOrderStatus-Status'] !== 10"
             @click="handleUpdate(scope.row)"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-						:disabled="scope.row['OM_WorkOrderStatus-Status'] !== 10"
+            :disabled="scope.row['OM_WorkOrderStatus-Status'] !== 10"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
-					<el-button
+            >删除</el-button
+          >
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-						:disabled="scope.row['OM_WorkOrderStatus-Status'] >= 24"
+            :disabled="scope.row['OM_WorkOrderStatus-Status'] >= 24"
             @click="undoWorkorder(scope.row)"
-          >撤销调度</el-button>
-					<el-button
+            >撤销调度</el-button
+          >
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-						:disabled="scope.row['OM_WorkOrderStatus-Status'] > 40 || scope.row['OM_WorkOrderStatus-Status'] <24 || scope.row['OM_WorkOrderStatus-Status'] === 39"
+            :disabled="
+              scope.row['OM_WorkOrderStatus-Status'] > 40 ||
+              scope.row['OM_WorkOrderStatus-Status'] < 24 ||
+              scope.row['OM_WorkOrderStatus-Status'] === 39
+            "
             @click="terminateOrder(scope.row)"
-          >订单终止</el-button>
-					<el-button
+            >订单终止</el-button
+          >
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-						:disabled="scope.row['OM_WorkOrderStatus-Status'] !== 40 && scope.row['OM_WorkOrderStatus-Status'] !== 26"
+            :disabled="
+              scope.row['OM_WorkOrderStatus-Status'] !== 40 &&
+              scope.row['OM_WorkOrderStatus-Status'] !== 26
+            "
             @click="cancelOrder(scope.row)"
-          >终止已派工工单</el-button>
+            >终止已派工工单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNumber"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <el-dialog :title="title" :visible.sync="open" width="1000px" :close-on-click-modal="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      :close-on-click-modal="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-			<el-row>
-        <el-col :span="12">
-					<el-form-item :label="getColumnName('OM_WorkOrder-OrderType')" prop="OM_WorkOrder-OrderType">
-						<el-select v-model="form['OM_WorkOrder-OrderType']" disabled style="width:100%;" filterable placeholder="请选择">
-							<el-option
-								v-for="item in orderTypeArray"
-								:key="item['stdeftab-stdeftyp']"
-								:label="item['stdeftab-bez']"
-								:value="item['stdeftab-stdeftyp']"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item :label="getColumnName('OM_WorkOrder-ArtId')" prop="OM_WorkOrder-ArtId">
-						<el-select v-model="form['OM_WorkOrder-ArtId']" @change="artIdChange" :disabled="!isAdd" filterable placeholder="请选择" style="width:100%;">
-							<el-option
-								v-for="item in articleArray"
-								:key="item['Article-ArtId']"
-								:label="item['Article-ArtId']"
-								:value="item['Article-ArtId']"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12" :offset="12">
-					<el-form-item label="物料描述">
-						<el-input v-model="form['Article-Descr1']" disabled placeholder="请输入" />
-					</el-form-item>
-				</el-col>
-				</el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              :label="getColumnName('OM_WorkOrder-OrderType')"
+              prop="OM_WorkOrder-OrderType"
+            >
+              <el-select
+                v-model="form['OM_WorkOrder-OrderType']"
+                disabled
+                style="width: 100%"
+                filterable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in orderTypeArray"
+                  :key="item['stdeftab-stdeftyp']"
+                  :label="item['stdeftab-bez']"
+                  :value="item['stdeftab-stdeftyp']"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+					<el-col :span="12">
+            <el-form-item
+              :label="getColumnName('Article-CarModel')"
+              prop="Article-CarModel"
+            >
+              <el-select
+                v-model="form['Article-CarModel']"
+                @change="getArticleArray"
+                :disabled="!isAdd"
+                filterable
+								clearable
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in carModelList"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              :label="getColumnName('OM_WorkOrder-ArtId')"
+              prop="OM_WorkOrder-ArtId"
+            >
+              <el-select
+                v-model="form['OM_WorkOrder-ArtId']"
+                @change="artIdChange"
+                :disabled="!isAdd"
+                filterable
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in articleArray"
+                  :key="item['Article-ArtId']"
+                  :label="item['Article-ArtId']"
+                  :value="item['Article-ArtId']"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料描述">
+              <el-input
+                v-model="form['OM_WorkOrder-Descr1']"
+                disabled
+                placeholder="请输入"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-				<el-col :span="24">
-					<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-						<el-tab-pane label="一般设置" name="first">
-							<el-col :span="12">
-								<el-form-item :label="getColumnName('OM_WorkOrder-PlanQty')">
-									<el-input v-model="form['OM_WorkOrder-PlanQty']" placeholder="请输入" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item :label="getColumnName('OM_WorkOrder-PlanResourceId')" prop="OM_WorkOrder-PlanResourceId">
-									<el-select v-model="form['OM_WorkOrder-PlanResourceId']" style="width:100%;" filterable disabled placeholder="请选择">
-										<el-option
-											v-for="(item, index) in workLineArray"
-											:key="index"
-											:label="item['WorkLine-Descr']"
-											:value="item['WorkLine-WorkLineid']"
-										/>
-									</el-select>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item :label="getColumnName('OM_WorkOrder-QuantityPerHour')">
-									<el-input v-model="form['OM_WorkOrder-QuantityPerHour']" disabled placeholder="请输入" />
-								</el-form-item>
-							</el-col>
-						</el-tab-pane>
-						<el-tab-pane label="时间设置" name="second">
-							<el-col :span="12">
-								<el-form-item :label="getColumnName('OM_WorkOrder-PlanStartDate')" prop="OM_WorkOrder-PlanStartDate">
-											<el-date-picker
-												v-model="form['OM_WorkOrder-PlanStartDate']"
-												type="date"
-												value-format="yyyy-MM-dd"
-												placeholder="选择日期"
-												:picker-options="startTime"
-												:disabled="!isAdd"
-											/>
-										</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item :label="getColumnName('OM_WorkOrder-PlanEndDate')" prop="OM_WorkOrder-PlanEndDate">
-											<el-date-picker
-												v-model="form['OM_WorkOrder-PlanEndDate']"
-												type="date"
-												value-format="yyyy-MM-dd"
-												placeholder="选择日期"
-												:picker-options="endTime"
-												:disabled="!isAdd"
-											/>
-										</el-form-item>
-							</el-col>
-						</el-tab-pane>
-					</el-tabs>
-				</el-col>
+        <el-col :span="24">
+          <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+            <el-tab-pane label="一般设置" name="first">
+              <el-col :span="12">
+                <el-form-item :label="getColumnName('OM_WorkOrder-PlanQty')">
+                  <el-input
+                    v-model="form['OM_WorkOrder-PlanQty']"
+                    placeholder="请输入"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  :label="getColumnName('OM_WorkOrder-PlanResourceId')"
+                  prop="OM_WorkOrder-PlanResourceId"
+                >
+                  <el-select
+                    v-model="form['OM_WorkOrder-PlanResourceId']"
+                    style="width: 100%"
+                    filterable
+                    disabled
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="(item, index) in workLineArray"
+                      :key="index"
+                      :label="item['WorkLine-Descr']"
+                      :value="item['WorkLine-WorkLineid']"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  :label="getColumnName('OM_WorkOrder-QuantityPerHour')"
+                >
+                  <el-input
+                    v-model="form['OM_WorkOrder-QuantityPerHour']"
+                    disabled
+                    placeholder="请输入"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-tab-pane>
+            <el-tab-pane label="时间设置" name="second">
+              <el-col :span="12">
+                <el-form-item
+                  :label="getColumnName('OM_WorkOrder-PlanStartDate')"
+                  prop="OM_WorkOrder-PlanStartDate"
+                >
+                  <el-date-picker
+                    v-model="form['OM_WorkOrder-PlanStartDate']"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    :picker-options="startTime"
+                    :disabled="!isAdd"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  :label="getColumnName('OM_WorkOrder-PlanEndDate')"
+                  prop="OM_WorkOrder-PlanEndDate"
+                >
+                  <el-date-picker
+                    v-model="form['OM_WorkOrder-PlanEndDate']"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    :picker-options="endTime"
+                    :disabled="!isAdd"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-		<el-dialog title="订单终止" :visible.sync="isTerminateOrder" width="1000px" :close-on-click-modal="false">
-			<el-form ref="terminateOrderForm" :model="terminateOrderForm" :rules="rules" label-width="150px">
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="剩余数量" prop="OM_WorkOrder-OrderType">
-							<el-input disabled v-model="terminateOrderForm.plan" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="终止数量" prop="OM_WorkOrder-OrderType">
-							<el-input v-model="terminateOrderForm.qty" type="number"  />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitTerminateOrderForm">确 定</el-button>
+    <el-dialog
+      title="订单终止"
+      :visible.sync="isTerminateOrder"
+      width="1000px"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="terminateOrderForm"
+        :model="terminateOrderForm"
+        :rules="rules"
+        label-width="150px"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="剩余数量" prop="OM_WorkOrder-OrderType">
+              <el-input disabled v-model="terminateOrderForm.plan" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="终止数量" prop="OM_WorkOrder-OrderType">
+              <el-input v-model="terminateOrderForm.qty" type="number" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitTerminateOrderForm"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
-		</el-dialog>
-		<el-dialog title="终止已派工工单" :visible.sync="isSancelrelease" width="1000px" :close-on-click-modal="false">
-			<el-form ref="cancelOrderForm" :model="cancelOrderForm" :rules="rules" label-width="150px">
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="剩余数量">
-							<el-input disabled v-model="cancelOrderForm.plan" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="终止数量">
-							<el-input v-model="cancelOrderForm.qty" type="number" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitCancelOrderForm">确 定</el-button>
+    </el-dialog>
+    <el-dialog
+      title="终止已派工工单"
+      :visible.sync="isSancelrelease"
+      width="1000px"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="cancelOrderForm"
+        :model="cancelOrderForm"
+        :rules="rules"
+        label-width="150px"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="剩余数量">
+              <el-input disabled v-model="cancelOrderForm.plan" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="终止数量">
+              <el-input v-model="cancelOrderForm.qty" type="number" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitCancelOrderForm"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
-		</el-dialog>
-		<el-dialog title="明细" :visible.sync="isDetailsOrder" width="90%" :close-on-click-modal="false">
-			<el-table v-loading="detailsLoading" :data="dataDetailsList" border height="410">
-				<el-table-column v-for="(item, index) in detailsHeaders" :key="index+'aaa'" :label="getColumnName(item)" :show-overflow-tooltip="true" align="center">
-					<template slot-scope="scope">
-						<div v-if="item === 'OM_SerialOrder-SerialOrderStatus'"
-							:class="[colorData[scope.row[item]['OM_SerialOrderStatus-Status']], 'bg-div']"> 
-							{{ fieldTrans(scope.row[item]['OM_SerialOrderStatus-Status']) }} 
-						</div>
-						<span v-else>{{ scope.row[item] }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column
-					v-for="(item, index) in detailsTimeHeaders"
-					:key="index"
-					:label="getColumnName(item)"
-					:show-overflow-tooltip="true"
-					width="170"
-					align="center">
-					<template slot-scope="scope">
-						<span v-if="item === 'OM_SerialOrder-ActEndTime' && scope.row[item] === '19000101000000'"></span>
-						<span v-else>{{ parseTime(scope.row[item]) }}</span>
-					</template>
-				</el-table-column>
-    	</el-table>
-			<div slot="footer" class="dialog-footer">
+    </el-dialog>
+    <el-dialog
+      title="明细"
+      :visible.sync="isDetailsOrder"
+      width="90%"
+      :close-on-click-modal="false"
+    >
+      <el-table
+        v-loading="detailsLoading"
+        :data="dataDetailsList"
+        border
+        height="410"
+      >
+        <el-table-column
+          v-for="(item, index) in detailsHeaders"
+          :key="index + 'aaa'"
+          :label="getColumnName(item)"
+          :show-overflow-tooltip="true"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div
+              v-if="item === 'OM_SerialOrder-SerialOrderStatus'"
+              :class="[
+                colorData[scope.row[item]['OM_SerialOrderStatus-Status']],
+                'bg-div',
+              ]"
+            >
+              {{ fieldTrans(scope.row[item]['OM_SerialOrderStatus-Status']) }}
+            </div>
+            <span v-else>{{ scope.row[item] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in detailsTimeHeaders"
+          :key="index"
+          :label="getColumnName(item)"
+          :show-overflow-tooltip="true"
+          width="170"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span
+              v-if="
+                item === 'OM_SerialOrder-ActEndTime' &&
+                scope.row[item] === '19000101000000'
+              "
+            ></span>
+            <span v-else>{{ parseTime(scope.row[item]) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-		</el-dialog>
+    </el-dialog>
   </div>
 </template>
 
@@ -329,7 +523,8 @@ import {
 	getWorkorderNum,
 	setWorkorderNum,
 	getSerialOrder,
-	setSancelrelease
+	setSancelrelease,
+	getSelectallcarmodel
 } from '@/api/productplan/base'
 import { getProjectList } from '@/api/system/project'
 import { getWorkshopList } from '@/common/workshop'
@@ -417,7 +612,8 @@ export default {
         90:'has-shipment-bg',
         95:'freeze-bg',
         98:'has-cancel-bg',
-      }
+      },
+			carModelList:[]
     }
   },
   created() {
@@ -427,12 +623,6 @@ export default {
 		this.getStanderOne({ statid: 'OM_OrderType' }).then(res => {
 			this.orderTypeArray = res.data
 		})
-		// 获取零件数据
-		getArticleList({
-			status:1
-		}).then(res => {
-      this.articleArray = res.data
-    })
 		// 获取产线数据
 		getWorklineList().then(res => {
       this.workLineArray = res.data
@@ -445,8 +635,43 @@ export default {
 		getProjectList().then(res => {
       this.projectArray = res.data
     })
+		this.getArticleList(undefined);
+		this.getSelectallcarmodel();
   },
   methods: {
+		// 获取carmodel数据
+		getSelectallcarmodel(){
+			getSelectallcarmodel().then(({data=[]})=>{
+				this.carModelList=data || [];
+			})
+		},
+		// 选择CarModel后获取物料
+		getArticleArray(value){
+			this.$set(this.form,'OM_WorkOrder-ArtId',undefined)
+			this.$set(this.form,'OM_WorkOrder-QuantityPerHour',undefined) // 小时产出JPH
+			this.$set(this.form,'OM_WorkOrder-PlanResourceId',undefined) // 计划资源ID
+			this.$set(this.form,'Article-Descr1',undefined) // 计划资源ID
+			// 接口需要的隐藏参数
+			this.$set(this.form,'OM_WorkOrder-QtyUomId',undefined)
+			this.$set(this.form,'OM_WorkOrder-UsedResourceId',undefined)
+			this.$set(this.form,'OM_WorkOrder-OpTimePerItem',undefined)
+			this.$set(this.form,'OM_WorkOrder-PlanResourceGroupId',undefined)
+			this.$set(this.form,'OM_WorkOrder-ProjectId',undefined)
+			this.$set(this.form,'OM_WorkOrder-RatePerHourToggle',undefined)
+			this.$set(this.form,'OM_WorkOrder-BatchTime',undefined)
+			this.$set(this.form,'OM_WorkOrder-BatchingMethod',undefined)
+			this.$set(this.form,'OM_WorkOrder-OrderInfo',undefined)
+			this.getArticleList(value);
+		},
+		// 获取零件数据
+		getArticleList(value){
+			getArticleList({
+				status:1,
+				carModel:value?value:undefined
+			}).then(res => {
+				this.articleArray = res.data
+			})
+		},
     /** 查询角色列表 */
     getList() {
       this.loading = true
@@ -536,7 +761,8 @@ export default {
 			this.isTerminateOrder = false
 			this.isSancelrelease = false
 			this.isDetailsOrder = false
-      this.reset()
+      this.reset();
+			this.getArticleList(undefined);
     },
     // 表单重置
     reset() {
@@ -763,7 +989,7 @@ export default {
 
 <style lang="scss" scoped>
 .bg-div {
-	height: 30px;
-	line-height: 30px;
+  height: 30px;
+  line-height: 30px;
 }
 </style>