工序、工艺添加字段

src/api/plant/processData/basicCommunication.js

@@ -54,4 +54,12 @@ export function getStationList (params) {
 		method: 'get',
 		params
 	})
+}
+// 查询产线所有数据
+export function getWorkLineList (params) {
+	return request({
+		url: '/admin/base/workline/query',
+		method: 'get',
+		params
+	})
 }

src/api/plant/processData/technology.js

@@ -32,14 +32,22 @@ export function edit (data) {
 	})
 }
 
-// 获取产线数据
-export function getWorkLineList () {
+// 获取工序数据列表
+export function getProcessList () {
 	return request({
 		url: '/admin/base/process/query',
 		method: 'get'
 	})
 }
 
+// 获取产线数据列表
+export function getWorkLineList () {
+	return request({
+		url: '/admin/base/workline/query',
+		method: 'get'
+	})
+}
+
 // 获取Attribute
 export function getAttribute(){
 	return request({

src/views/plant/processData/basicCommunication/addOrEdit.vue

@@ -32,7 +32,7 @@
               </el-option>
             </el-select> </el-form-item
         ></el-col>
-        
+
         <el-col :span="8">
           <el-form-item
             :label="getColumnName('OPCBasicComInfo-StepNo')"
@@ -102,20 +102,38 @@
             :label="getColumnName('OPCBasicComInfo-BrandName')"
             prop="OPCBasicComInfo-BrandName"
           >
-            <el-input
+            <el-select
+              style="width: 100%"
               v-model="formData['OPCBasicComInfo-BrandName']"
-              placeholder="请输入"
-            ></el-input> </el-form-item
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in brandNameList"
+                :key="item['stdeftab-stdeftyp']"
+                :label="item['stdeftab-bez']"
+                :value="item['stdeftab-stdeftyp']"
+              >
+              </el-option>
+            </el-select> </el-form-item
         ></el-col>
         <el-col :span="8">
           <el-form-item
             :label="getColumnName('OPCBasicComInfo-MachineType')"
             prop="OPCBasicComInfo-MachineType"
           >
-            <el-input
+            <el-select
+              style="width: 100%"
               v-model="formData['OPCBasicComInfo-MachineType']"
-              placeholder="请输入"
-            ></el-input> </el-form-item
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in machineTypeList"
+                :key="item['stdeftab-stdeftyp']"
+                :label="item['stdeftab-bez']"
+                :value="item['stdeftab-stdeftyp']"
+              >
+              </el-option>
+            </el-select> </el-form-item
         ></el-col>
         <el-col :span="8">
           <el-form-item
@@ -357,6 +375,8 @@ export default {
       actionTypeList:[], // 操作类型列表
       DBlockList:[], //DB列表
       stationList:[], // 工位列表
+      brandNameList:[], // 品牌列表
+      machineTypeList:[], // 型号列表
     }
   },
   methods:{
@@ -466,9 +486,23 @@ export default {
       getStationList().then(({data=[]})=>{
         this.stationList = data;
       })
+    },
+    // 获取品牌列表
+    getBrandNameList(){
+      this.getStanderOne({ statid: 'OPCBasicComInfo-BrandName' }).then(({data=[]}) => {
+        this.brandNameList=data;
+      })
+    },
+    // 获取型号列表
+    getMachineTypeList(){
+      this.getStanderOne({ statid: 'OPCBasicComInfo-MachineType' }).then(({data=[]}) => {
+        this.machineTypeList=data;
+      })
     }
   },
   created(){
+    this.getBrandNameList();
+    this.getMachineTypeList();
     this.getOperationList();
     this.getActionTypeList();
     this.getDBlockList();

src/views/plant/processData/openProtocol/addOrEdit.vue

@@ -108,10 +108,19 @@
             :label="getColumnName('TightenWrenchInfo-BrandName')"
             prop="TightenWrenchInfo-BrandName"
           >
-            <el-input
+            <el-select
+              style="width: 100%"
               v-model="item['TightenWrenchInfo-BrandName']"
-              placeholder="请输入"
-            ></el-input>
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in brandNameList"
+                :key="item['stdeftab-stdeftyp']"
+                :label="item['stdeftab-bez']"
+                :value="item['stdeftab-stdeftyp']"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -119,10 +128,19 @@
             :label="getColumnName('TightenWrenchInfo-MachineType')"
             prop="TightenWrenchInfo-MachineType"
           >
-            <el-input
+            <el-select
+              style="width: 100%"
               v-model="item['TightenWrenchInfo-MachineType']"
-              placeholder="请输入"
-            ></el-input>
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in machineTypeList"
+                :key="item['stdeftab-stdeftyp']"
+                :label="item['stdeftab-bez']"
+                :value="item['stdeftab-stdeftyp']"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -273,6 +291,8 @@ export default {
       operationList:[], // 工艺列表
       mainControlActionList:[], // 状态列表
       stationList:[], // 工位列表
+      brandNameList:[], // 品牌列表
+      machineTypeList:[], // 型号列表
     }
   },
   methods:{
@@ -388,9 +408,23 @@ export default {
       getStationList().then(({data=[]})=>{
         this.stationList = data;
       })
+    },
+    // 获取品牌列表
+    getBrandNameList(){
+      this.getStanderOne({ statid: 'TightenWrenchInfo-BrandName' }).then(({data=[]}) => {
+        this.brandNameList=data;
+      })
+    },
+    // 获取型号列表
+    getMachineTypeList(){
+      this.getStanderOne({ statid: 'TightenWrenchInfo-MachineType' }).then(({data=[]}) => {
+        this.machineTypeList=data;
+      })
     }
   },
   created(){
+    this.getBrandNameList();
+    this.getMachineTypeList();
     this.getOperation();
     this.getStationList();
     this.getStanderOne({ statid: 'MainControlAction' }).then(({data=[]}) => {

src/views/plant/processData/openProtocol/index.vue

@@ -116,7 +116,8 @@ export default {
     getTableList(){
       getTableList({
         ...this.queryParams,
-        ...this.formData
+        ...this.formData,
+        'stepNo':this.formData['stepNo'] ? this.formData['stepNo'] : undefined,
       }).then(({data:{count=0, records=[]}})=>{
         this.queryParams.total=count;
         this.tableData=records;

src/views/plant/processData/technology/addOrEdit.vue

@@ -23,10 +23,11 @@
             <el-select
               v-model="item['Operation-PO']"
               placeholder="请选择"
+              @change="setWorkLineId"
               :disabled="isAddOrEdit=='edit'"
             >
               <el-option
-                v-for="item in workLineList"
+                v-for="item in processList"
                 :key="item['Process-PO']"
                 :label="item['Process-Descr']"
                 :value="item['Process-PO']"
@@ -34,6 +35,17 @@
               </el-option>
             </el-select> </el-form-item
         ></el-col>
+        <el-col :span="6">
+          <el-form-item
+            :label="getColumnName('Operation-WorkLineId')"
+            prop="Operation-WorkLineId"
+          >
+            <el-input
+              disabled
+              v-model="item['Operation-WorkLineId']"
+              placeholder="请输入"
+            ></el-input> </el-form-item
+        ></el-col>
         <el-col :span="6">
           <el-form-item
             :label="getColumnName('Operation-StepNo')"
@@ -168,7 +180,7 @@
   </el-dialog>
 </template>
 <script>
-import {add, edit, getWorkLineList, getAttribute, getAttributeValue, getSteptype, getProjectList} from '@/api/plant/processData/technology'
+import {add, edit, getProcessList, getAttribute, getAttributeValue, getSteptype, getProjectList} from '@/api/plant/processData/technology'
 export default {
   props:{
     item:{
@@ -185,6 +197,9 @@ export default {
         'Operation-StepNo':[
           { required: true, message: '请填写', trigger: 'change' }
         ],
+        'Operation-WorkLineId':[
+          { required: true, message: '请填写', trigger: 'change' }
+        ],
         'Operation-StepDesc': [
           { required: true, message: '请填写', trigger: 'change' }
         ],
@@ -210,7 +225,7 @@ export default {
           { required: true, message: '请选择', trigger: 'change' }
         ]
       },
-      workLineList:[], // 产线列表
+      processList:[], // 工序列表
       attributeList:[],
       stepTypeList:[], // 操作类型列表
       attrValueList:[], // 属性值列表
@@ -262,11 +277,16 @@ export default {
       })
     },
     // 获取产线列表
-    getWorkLineList(){
-      getWorkLineList().then(({data=[]})=>{
-        this.workLineList=data;
+    getProcessList(){
+      getProcessList().then(({data=[]})=>{
+        this.processList=data;
       })
     },
+    // 更新产线ID
+    setWorkLineId(value){
+      const item=this.processList.find(e=>e['Process-PO'] == value);
+      this.item['Operation-WorkLineId']= item['Process-WorkLineId'];
+    },
     getAttribute(){
       getAttribute().then(({data=[]})=>{
         this.attributeList=data;
@@ -294,7 +314,7 @@ export default {
   created(){
     this.item['Operation-ActivateInStation']=this.item['Operation-ActivateInStation']?this.item['Operation-ActivateInStation']:false;
     this.item['Operation-ActivateWhenRepair']=this.item['Operation-ActivateWhenRepair']?this.item['Operation-ActivateWhenRepair']:false;
-    this.getWorkLineList();
+    this.getProcessList();
     this.getAttribute();
     this.getSteptype();
     this.getProjectList();

src/views/plant/processData/technology/index.vue

@@ -1,36 +1,102 @@
 <template>
   <div class="operation-type-wrap">
-    <el-form :inline="true" ref="formRef" :model="formData" class="demo-form-inline">
+    <el-form
+      :inline="true"
+      ref="formRef"
+      :model="formData"
+      class="demo-form-inline"
+    >
       <el-form-item :label="getColumnName('Operation-StepNo')">
         <el-input v-model="formData['stepNo']" placeholder="请输入"></el-input>
       </el-form-item>
+      <el-form-item :label="getColumnName('Operation-WorkLineId')">
+        <el-select
+          v-model="formData['workLineId']"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in workLineList"
+            :key="item['WorkLine-WorkLineid']"
+            :label="item['WorkLine-Descr']"
+            :value="item['WorkLine-WorkLineid']"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-        <el-button type="warning" icon="el-icon-refresh" @click="reset">重置</el-button>
-        <el-button type="primary" @click="setIsAddOrEdit('add')">新增</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="search"
+          >查询</el-button
+        >
+        <el-button type="warning" icon="el-icon-refresh" @click="reset"
+          >重置</el-button
+        >
+        <el-button type="primary" @click="setIsAddOrEdit('add')"
+          >新增</el-button
+        >
       </el-form-item>
     </el-form>
-    <el-table border :data="tableData" style="width: 100%" :total="queryParams.total" :page.sync="queryParams.pageNumber"
-      :limit.sync="queryParams.pageSize">
-      <el-table-column prop="Operation-PO" width="100" :label="getColumnName('Operation-PO')">
+    <el-table
+      border
+      :data="tableData"
+      style="width: 100%"
+      :total="queryParams.total"
+      :page.sync="queryParams.pageNumber"
+      :limit.sync="queryParams.pageSize"
+    >
+      <el-table-column
+        prop="Operation-PO"
+        width="100"
+        :label="getColumnName('Operation-PO')"
+      >
       </el-table-column>
-      <el-table-column prop="Operation-StepDesc" width="200" :label="getColumnName('Operation-StepDesc')">
+      <el-table-column
+        prop="Operation-WorkLineId"
+        width="100"
+        :label="getColumnName('Operation-WorkLineId')"
+      >
       </el-table-column>
-      <el-table-column prop="Operation-StepNo" :label="getColumnName('Operation-StepNo')">
+      <el-table-column
+        prop="Operation-StepDesc"
+        width="200"
+        :label="getColumnName('Operation-StepDesc')"
+      >
       </el-table-column>
-      <el-table-column prop="Operation-StepType" width="150" :label="getColumnName('Operation-StepType')">
+      <el-table-column
+        prop="Operation-StepNo"
+        :label="getColumnName('Operation-StepNo')"
+      >
       </el-table-column>
-      <el-table-column prop="Operation-ProjectId" width="200" :label="getColumnName('Operation-ProjectId')">
+      <el-table-column
+        prop="Operation-StepType"
+        width="150"
+        :label="getColumnName('Operation-StepType')"
+      >
       </el-table-column>
-      <el-table-column prop="Operation-OperationId" width="100" :label="getColumnName('Operation-OperationId')">
+      <el-table-column
+        prop="Operation-ProjectId"
+        width="200"
+        :label="getColumnName('Operation-ProjectId')"
+      >
       </el-table-column>
-      <el-table-column prop="Operation-AttrCode" :label="getColumnName('Operation-AttrCode')">
+      <el-table-column
+        prop="Operation-OperationId"
+        width="100"
+        :label="getColumnName('Operation-OperationId')"
+      >
       </el-table-column>
-      <el-table-column prop="Operation-AttrValue" :label="getColumnName('Operation-AttrValue')">
+      <el-table-column
+        prop="Operation-AttrCode"
+        :label="getColumnName('Operation-AttrCode')"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="Operation-AttrValue"
+        :label="getColumnName('Operation-AttrValue')"
+      >
       </el-table-column>
       <el-table-column
         prop="Operation-ActivateInStation"
-         width="100"
+        width="100"
         :label="getColumnName('Operation-ActivateInStation')"
       >
         <template slot-scope="scope">
@@ -45,7 +111,7 @@
       </el-table-column>
       <el-table-column
         prop="Operation-ActivateWhenRepair"
-         width="100"
+        width="100"
         :label="getColumnName('Operation-ActivateWhenRepair')"
       >
         <template slot-scope="scope">
@@ -59,14 +125,25 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" width="400" align="center" fixed="right">
-      <!-- <el-table-column label="操作" width="650" align="center" fixed="right"> -->
         <template slot-scope="scope">
           <el-button size="mini" @click="setItem(scope.row)">编辑</el-button>
-          <!-- <el-button size="mini" :disabled="scope.row['Operation-StepType'] != 'OPC通讯'" @click="setOPCCommunication(scope.row)">配置OPC通讯</el-button> -->
-          <!-- <el-button size="mini" :disabled="scope.row['Operation-StepType'] != '开放协议'" @click="setOpenProtocol(scope.row)">配置开放协议</el-button> -->
-          <el-button size="mini" :disabled="scope.row['Operation-StepType'] != '指导操作'" @click="setOperationGuide(scope.row)">配置操作指导</el-button>
-          <el-button size="mini" :disabled="scope.row['Operation-StepType'] != '扫码校验'" @click="setScanRule(scope.row)">配置扫码规则</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
+          <!-- <el-button size="mini" v-if="scope.row['Operation-StepType'] == 'OPC通讯'" @click="setOPCCommunication(scope.row)">配置OPC通讯</el-button> -->
+          <!-- <el-button size="mini" v-if="scope.row['Operation-StepType'] == '开放协议'" @click="setOpenProtocol(scope.row)">配置开放协议</el-button> -->
+          <el-button
+            size="mini"
+            :disabled="scope.row['Operation-StepType'] != '指导操作'"
+            @click="setOperationGuide(scope.row)"
+            >配置操作指导</el-button
+          >
+          <el-button
+            size="mini"
+            :disabled="scope.row['Operation-StepType'] != '扫码校验'"
+            @click="setScanRule(scope.row)"
+            >配置扫码规则</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -77,11 +154,36 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getTableList"
     />
-    <AddOrEdit v-if="isAddOrEdit=='add' || isAddOrEdit=='edit'" :isAddOrEdit="isAddOrEdit" :item="item" @setIsAddOrEdit="setIsAddOrEdit" />
-    <ScanRule v-if="isAddOrEdit=='scanRule'" :isAddOrEdit="isAddOrEdit" :item="item" @setIsAddOrEdit="setIsAddOrEdit" />
-    <OperationGuide v-if="isAddOrEdit=='operationGuide'" :isAddOrEdit="isAddOrEdit" :item="item" @setIsAddOrEdit="setIsAddOrEdit" />
-    <OPCCommunication v-if="isAddOrEdit=='OPCCommunication'" :isAddOrEdit="isAddOrEdit" :item="item" @setIsAddOrEdit="setIsAddOrEdit" />
-    <OpenProtocol v-if="isAddOrEdit=='openProtocol'" :isAddOrEdit="isAddOrEdit" :item="item" @setIsAddOrEdit="setIsAddOrEdit" />
+    <AddOrEdit
+      v-if="isAddOrEdit == 'add' || isAddOrEdit == 'edit'"
+      :isAddOrEdit="isAddOrEdit"
+      :item="item"
+      @setIsAddOrEdit="setIsAddOrEdit"
+    />
+    <ScanRule
+      v-if="isAddOrEdit == 'scanRule'"
+      :isAddOrEdit="isAddOrEdit"
+      :item="item"
+      @setIsAddOrEdit="setIsAddOrEdit"
+    />
+    <OperationGuide
+      v-if="isAddOrEdit == 'operationGuide'"
+      :isAddOrEdit="isAddOrEdit"
+      :item="item"
+      @setIsAddOrEdit="setIsAddOrEdit"
+    />
+    <OPCCommunication
+      v-if="isAddOrEdit == 'OPCCommunication'"
+      :isAddOrEdit="isAddOrEdit"
+      :item="item"
+      @setIsAddOrEdit="setIsAddOrEdit"
+    />
+    <OpenProtocol
+      v-if="isAddOrEdit == 'openProtocol'"
+      :isAddOrEdit="isAddOrEdit"
+      :item="item"
+      @setIsAddOrEdit="setIsAddOrEdit"
+    />
   </div>
 </template>
 <script>
@@ -90,7 +192,7 @@ import ScanRule from './scanRule.vue';
 import OperationGuide from './operationGuide.vue';
 import OPCCommunication from './OPCCommunication.vue';
 import OpenProtocol from './openProtocol.vue';
-import {getTableList, delParser, getAttribute, getAttributeValue} from '@/api/plant/processData/technology'
+import {getTableList, delParser, getAttribute, getWorkLineList, getAttributeValue} from '@/api/plant/processData/technology'
 export default {
   components:{
     AddOrEdit,
@@ -111,7 +213,7 @@ export default {
       isAddOrEdit: '', // add-添加，edit-修改
       item:{}, // 当前要编辑的对象
       attributeList:[], // 属性编码列表
-
+      workLineList:[], // 产线列表
     }
   },
   methods:{
@@ -180,7 +282,8 @@ export default {
       getTableList({
         ...this.queryParams,
         ...this.formData,
-        'detailId':this.formData['detailId'] ? this.formData['detailId'] : undefined
+        'stepNo':this.formData['stepNo'] ? this.formData['stepNo'] : undefined,
+        'workLineId':this.formData['workLineId'] ? this.formData['workLineId'] : undefined
       }).then(({data:{count=0, records=[]}})=>{
         this.queryParams.total=count;
         this.tableData=records;
@@ -198,6 +301,15 @@ export default {
         this.attrValueList=Valst;
       })
     },
+    // 获取产线列表
+    getWorkLineList(){
+      getWorkLineList().then(({data=[]})=>{
+        this.workLineList=data;
+      })
+    },
+  },
+  created(){
+    this.getWorkLineList();
   },
   mounted(){
     this.getTableList();
@@ -205,11 +317,11 @@ export default {
 }
 </script>
 <style scoped>
-  .operation-type-wrap{
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-    padding: 10px;
-    padding-top: 36px;
-  }
+.operation-type-wrap {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 10px;
+  padding-top: 36px;
+}
 </style>

src/views/plant/resource/operationDefinition/index.vue

@@ -12,6 +12,20 @@
           placeholder="请输入工序名称"
         ></el-input>
       </el-form-item>
+      <el-form-item :label="getColumnName('Process-WorkLineid')">
+        <el-select
+          v-model="formData['workLineId']"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in workLineList"
+            :key="item['WorkLine-WorkLineid']"
+            :label="item['WorkLine-Descr']"
+            :value="item['WorkLine-WorkLineid']"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="search"
           >查询</el-button
@@ -144,7 +158,7 @@
 import AddOrEdit from './addOrEdit.vue';
 import DataDependency from './dataDependency.vue';
 import AssociatedStation from './associatedStation.vue';
-import {getTableList, delParser} from '@/api/plant/operationDefinition'
+import {getTableList, delParser, getProductionLine} from '@/api/plant/operationDefinition'
 export default {
   components:{
     AddOrEdit,
@@ -165,6 +179,7 @@ export default {
       item:{}, // 当前要编辑的对象
       isAssociatedStation:false, // 是否显示绑定工位界面
       isDataDependency: false, // 是否显示配置数据依赖界面
+      workLineList:[], // 产线列表
     }
   },
   methods:{
@@ -215,7 +230,9 @@ export default {
       this.loading=true;
       getTableList({
         ...this.queryParams,
-        ...this.formData
+        ...this.formData,
+        name: this.formData.name?this.formData.name:undefined,
+        workLineId:  this.formData.workLineId?this.formData.workLineId:undefined
       }).then(({data:{count=0, records=[]}})=>{
         this.loading=false
         this.queryParams.total=count;
@@ -241,8 +258,17 @@ export default {
       if(!this.isDataDependency){
         this.getTableList();
       }
+    },
+    // 产线列表
+    getWorkLineList(){
+      getProductionLine().then(({data=[]})=>{
+        this.workLineList=data
+      })
     }
   },
+  created(){
+    this.getWorkLineList();
+  },
   mounted(){
     this.getTableList();
   }