Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei

src/views/equip/basic/service.vue

@@ -180,7 +180,12 @@
         </el-col>
         <el-col :span="6">
           <el-form-item :label="getColumnName('pm_service-schedtype')">
-            <el-input v-model="form['pm_service-schedtype']" placeholder="请输入" />
+						<el-select v-model="form['pm_service-schedtype']" clearable placeholder="请选择">
+							<el-option v-for="item in scheduTypeArray"
+												:key="item['stdeftab-stdeftyp']"
+												:label="item['stdeftab-bez']"
+												:value="item['stdeftab-stdeftyp']" />
+						</el-select>
           </el-form-item>
         </el-col>
         <el-col :span="10" style="padding-right:2px">
@@ -201,6 +206,16 @@
               prop="pm_attribute-attrname"
               :label="getColumnName('pm_attribute-attrname')"
               show-overflow-tooltip
+            />
+						<el-table-column
+              prop="pm_attribute-attrnr"
+              :label="getColumnName('pm_attribute-attrnr')"
+              show-overflow-tooltip
+            />
+						<el-table-column
+              prop="pm_attribute-shortcode"
+              :label="getColumnName('pm_attribute-shortcode')"
+              show-overflow-tooltip
             />
             <el-table-column
               prop="pm_attribute-parameter"
@@ -218,7 +233,7 @@
             <el-button type="primary" size="mini" :disabled="!isAssign" icon="el-icon-arrow-right" @click="handleToRight" />
             <el-button type="primary" style="float:right" size="mini" :disabled="!isUnassign" icon="el-icon-arrow-left" @click="handleToLeft" />
             <div class="table-form">参数</div>
-            <el-select v-model="arg" placeholder="请选择" style="width:100%">
+            <el-select v-model="arg" placeholder="请选择" style="width:100%" @change="argChange">
               <el-option
                 v-for="item in argArray"
                 :key="item['stdeftab-stdeftyp']"
@@ -244,6 +259,16 @@
             <el-table-column
               prop="pm_attribute-attrname"
               :label="getColumnName('pm_attribute-attrname')"
+            />
+						<el-table-column
+              prop="pm_attribute-attrnr"
+              :label="getColumnName('pm_attribute-attrnr')"
+              show-overflow-tooltip
+            />
+						<el-table-column
+              prop="pm_attribute-shortcode"
+              :label="getColumnName('pm_attribute-shortcode')"
+              show-overflow-tooltip
             />
           </el-table>
         </el-col>
@@ -292,6 +317,7 @@ export default {
         descr: undefined
       },
       argArray: [],
+			scheduTypeArray: [],
       arg: '',
       // 是否未分配
       isUnassign: false,
@@ -317,6 +343,9 @@ export default {
     this.options = getWorkshopList()
     this.getStanderOne({ statid: 'pm_parameter' }).then(res => {
       this.argArray = res.data
+    })
+		this.getStanderOne({ statid: 'Scheduling_Type' }).then(res => {
+      this.scheduTypeArray = res.data
     })
     self = this
   },
@@ -391,13 +420,30 @@ export default {
       this.queryParams.pageIndex = 1
       this.getList()
     },
+		// 选择参数触发的事件
+		argChange() {
+			if (this.unassignArray.length > 0 && this.arg) {
+				this.isUnassign = true
+			} else {
+				this.isUnassign = false
+			}
+			if (this.assignArray.length > 0) {
+				this.isAssign = true
+			} else {
+				this.isAssign = false
+			}
+		},
     /** 选择未分配 */
     handleSelectionUnassign(selection) {
       this.unassignArray = []
       selection.forEach(element => {
         this.unassignArray.push(element)
       })
-      this.isUnassign = this.unassignArray.length > 0
+			if (this.unassignArray.length > 0 && this.arg) {
+				this.isUnassign = true
+			} else {
+				this.isUnassign = false
+			}
     },
     /** 选择已分配 */
     handleSelectionAssign(selection) {
@@ -405,7 +451,12 @@ export default {
       selection.forEach(element => {
         this.assignArray.push(element)
       })
-      this.isAssign = this.assignArray.length > 0
+      // this.isAssign = this.assignArray.length > 0 && this.arg
+			if (this.assignArray.length > 0) {
+				this.isAssign = true
+			} else {
+				this.isAssign = false
+			}
     },
     /** 已分配 ->未分配*/
     handleToRight() {

src/views/equip/workbench/order.vue

@@ -147,7 +147,8 @@
         <vxe-table-column field="action" :title="getColumnName('action')" width="100" show-overflow>
           <template v-slot="{ row }">
             <!--父订单状态40可编辑-->
-            <vxe-button type="text" :disabled="row.status !== 40" icon="el-icon-edit-outline" @click="editEvent(row)" />
+						<vxe-button type="text" :disabled="row.status === 40 && row.parameter === 'CHECK_BOX'" icon="el-icon-edit-outline" @click="editEvent(row)" />
+            <!-- <vxe-button type="text" :disabled="row.status !== 40" icon="el-icon-edit-outline" @click="editEvent(row)" /> -->
           </template>
         </vxe-table-column>
       </vxe-table>
@@ -406,11 +407,13 @@ export default {
         let flag = false
         if (row.status === 40) {
 					if (this.valstData.length > 0) {
+						this.rowData = row
+						this.open = true
 						this.valstData.forEach((item) => {
 							if (flag) return
-							if (item.actvalue === '' || item.actvalue === 'false') {
-								this.rowData = row
-								this.open = true
+							if (item.actvalue === '' || item.actvalue === false) {
+								// this.rowData = row
+								// this.open = true
 								flag = true
 								return false
 							}
@@ -425,7 +428,11 @@ export default {
           finr: row.finr,
           maintwoid: row.maintwoid,
           status: this.updatestatusEnum[row.status],
-        })
+        }).then(res => {
+					if (res.code === 200) {
+						this.open = false
+					}
+				})
         this.getList()
       }
     },