Explorar o código

工单制定、设备管理细节修改

liuwj %!s(int64=2) %!d(string=hai) anos
pai
achega
e86f3ba075

+ 3 - 3
itdmWeb/src/views/module-iTDM/itdmDevice/modules/ItdmDeviceForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceName">
-              <a-input v-model="model.deviceName" placeholder="请输入设备名称" disabled="editdisabled" ></a-input>
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称" :disabled="editdisabled" ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -20,7 +20,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="设备状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceStatus">
-              <j-dict-select-tag type="list" v-model="model.deviceStatus" dictCode="device_status" placeholder="请选择设备状态" disabled="editdisabled"/>
+              <j-dict-select-tag type="list" v-model="model.deviceStatus" dictCode="device_status" placeholder="请选择设备状态" :disabled="editdisabled"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -134,7 +134,7 @@
     },
     methods: {
       add () {
-        this.edit(this.modelDefault);
+  this.edit(this.modelDefault);
       },
       edit (record) {
         this.model = Object.assign({}, record);

+ 37 - 37
itdmWeb/src/views/module-iTDM/itdmGongdanDetail/ItdmGongdanDetailList.vue

@@ -52,19 +52,19 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('工单detail')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+<!--      </a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
@@ -108,24 +108,24 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+<!--        <span slot="action" slot-scope="text, record">-->
+<!--          <a @click="handleEdit(record)">编辑</a>-->
 
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
+<!--          <a-divider type="vertical" />-->
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
+<!--        </span>-->
 
       </a-table>
     </div>
@@ -169,7 +169,7 @@ export default {
           dataIndex: 'woId'
         },
         {
-          title:'实绩设备id',
+          title:'实绩设备',
           align:"center",
           dataIndex: 'shijiShebeiId_dictText'
         },
@@ -224,15 +224,15 @@ export default {
           align:"center",
           dataIndex: 'chuanganqi_dictText'
           // dataIndex: 'chuanganqi'
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align:"center",
-          fixed:"right",
-          width:147,
-          scopedSlots: { customRender: 'action' }
         }
+        // {
+        //   title: '操作',
+        //   dataIndex: 'action',
+        //   align:"center",
+        //   fixed:"right",
+        //   width:147,
+        //   scopedSlots: { customRender: 'action' }
+        // }
       ],
       url: {
         list: "/itdmGongdanDetail/itdmGongdanDetail/list",

+ 8 - 2
itdmWeb/src/views/module-iTDM/itdmGongdanDetail/modules/ItdmGongdanDetailForm.vue

@@ -5,11 +5,11 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="工单id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="woId">
-              <a-input v-model="model.woId" placeholder="请输入工单id"  ></a-input>
+              <a-input v-model="model.woId" placeholder="请输入工单id" :disabled="editdisabled"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩设备id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShebeiId">
+            <a-form-model-item label="实绩设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShebeiId">
               <j-search-select-tag v-model="model.shijiShebeiId" dict="itdm_device,device_name,id"  />
             </a-form-model-item>
           </a-col>
@@ -85,6 +85,12 @@ export default {
       type: Boolean,
       default: false,
       required: false
+    },
+    //禁止编辑
+    editdisabled: {
+      type: Boolean,
+      default: false,
+      required: false
     }
   },
   data () {

+ 4 - 2
itdmWeb/src/views/module-iTDM/itdmGongdanDetail/modules/ItdmGongdanDetailModal.vue

@@ -8,7 +8,7 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <itdm-gongdan-detail-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-gongdan-detail-form>
+    <itdm-gongdan-detail-form ref="realForm" @ok="submitCallback" :editdisabled="editdisabled" :disabled="disableSubmit"></itdm-gongdan-detail-form>
   </j-modal>
 </template>
 
@@ -25,7 +25,8 @@
         title:'',
         width:800,
         visible: false,
-        disableSubmit: false
+        disableSubmit: false,
+        editdisabled:false
       }
     },
     methods: {
@@ -36,6 +37,7 @@
         })
       },
       edit (record) {
+        this.editdisabled=true
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.edit(record);