Merge remote-tracking branch 'origin/master'

src/views/module_cmms/spotcheck/modules/SpotcheckForm.vue

@@ -323,6 +323,8 @@
                   url: res
                 }
               })
+            }else{
+              this.model.files = []
             }
             httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){

src/views/module_cmms/upkeep/UpkeepList.vue

@@ -4,6 +4,38 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="工单编号">
+              <a-input placeholder="请输入工单编号" v-model="queryParam.upkeepcode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="计划名称">
+              <a-input placeholder="请输入计划名称" v-model="queryParam.planname"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="设备">
+                <j-search-select-tag v-model="queryParam.equipmentid" dict="tpm_equipment,equipmentname,id"  placeholder="请选择设备"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="负责人">
+                <j-dict-select-tag v-model="queryParam.chargeruser" placeholder="请选择负责人" dictCode="sys_user,realname,id"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>

src/views/module_cmms/upkeep/modules/UpkeepForm.vue

@@ -2,17 +2,18 @@
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <div class="cmms-dialog-item-title">保养工单基本信息</div>
         <a-row>
           <a-col :span="12">
             <a-form-model-item label="保养工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepcode">
-              {{model.upkeepcode}}
-              <!-- <a-input v-model="model.upkeepcode" placeholder="请输入保养工单编号"  ></a-input> -->
+              <!-- {{model.upkeepcode}} -->
+              <a-input v-model="model.upkeepcode" placeholder="请输入保养工单编号" :disabled="true" ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="计划名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planname">
-              {{model.planname}}
-              <!-- <a-input v-model="model.planname" placeholder="请输入计划名称"  ></a-input> -->
+              <!-- {{model.planname}} -->
+              <a-input v-model="model.planname" placeholder="请输入计划名称" :disabled="true" ></a-input>
             </a-form-model-item>
           </a-col>
           <!-- <a-col :span="12">
@@ -37,8 +38,8 @@
           </a-col> -->
           <a-col :span="12">
             <a-form-model-item label="地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              {{model.address}}
-              <!-- <a-input v-model="model.address" placeholder="请输入地点"  ></a-input> -->
+              <!-- {{model.address}} -->
+              <a-input v-model="model.address" placeholder="请输入地点" :disabled="true" ></a-input>
             </a-form-model-item>
           </a-col>
           <!-- <a-col :span="12">
@@ -63,8 +64,8 @@
           </a-col> -->
           <a-col :span="12">
             <a-form-model-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeruser">
-              {{model.chargeruser_dictText}}
-              <!-- <j-dict-select-tag v-model="model.chargeruser" placeholder="请选择负责人" dictCode="sys_user,realname,id"/> -->
+              <!-- {{model.chargeruser_dictText}} -->
+              <j-dict-select-tag v-model="model.chargeruser" placeholder="请选择负责人" dictCode="sys_user,realname,id" :disabled="true"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -74,11 +75,19 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
+            <a-form-model-item label="选择设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
+              <j-search-select-tag v-model="model.equipmentid" dict="tpm_equipment,equipmentname,id"  style="width: 100%" :disabled="true"/>
+                <!-- <a-button type="primary" icon="search" /> -->
+            </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="upkeepdesc">
               <a-textarea v-model="model.upkeepdesc" placeholder="请输入描述"  :auto-size="{ minRows: 2, maxRows: 2 }"></a-textarea>
-              <!-- <a-input v-model="model.upkeepdesc" placeholder="请输入描述"  ></a-input> -->
+            </a-form-model-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-model-item label="照片" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="remark">
+              <j-image-upload text="上传" v-model="model.files" isMultiple></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -93,6 +102,18 @@
             </a-form-model-item>
           </a-col>
         </a-row>
+        <div class="cmms-dialog-item-title">设备保养设置</div>
+        <a-table
+          ref="table"
+          size="middle"
+          :scroll="{x:true}"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="model.cmmsUpkeepItemList"
+          :pagination="false"
+          class="j-table-force-nowrap">
+        </a-table>
       </a-form-model>
     </j-form-container>
   </a-spin>
@@ -118,18 +139,19 @@
     data () {
       return {
         model:{
-         },
+          cmmsUpkeepItemList: []
+        },
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 8 },
+          sm: { span: 6 },
         },
         wrapperCol: {
           xs: { span: 24 },
-          sm: { span: 13 },
+          sm: { span: 12 },
         },
         labelCol2: {
           xs: { span: 24 },
-          sm: { span: 4 },
+          sm: { span: 3 },
         },
         wrapperCol2: {
           xs: { span: 24 },
@@ -147,6 +169,38 @@
             { required: true, message: '请输入处理意见!'},
           ],
         },
+        columns: [
+          {
+            title:'保养项ID',
+            align:"center",
+            dataIndex: 'id'
+          },
+          {
+            title:'保养项名称',
+            align:"center",
+            dataIndex: 'itemname'
+          },
+          // {
+          //   title:'设备类型',
+          //   align:"center",
+          //   dataIndex: 'equiptypeName'
+          // },
+          {
+            title:'保养项编号',
+            align:"center",
+            dataIndex: 'itemcode'
+          },
+          {
+            title:'保养项标准',
+            align:"center",
+            dataIndex: 'itemcontent'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+        ],
         url: {
           add: "/cmmsUpkeep/cmmsUpkeep/add",
           edit: "/cmmsUpkeep/cmmsUpkeep/edit",
@@ -168,7 +222,24 @@
         this.edit(this.modelDefault);
       },
       edit (record) {
-        this.model = Object.assign({}, record);
+        // this.model = Object.assign({}, record);
+        getAction(this.url.queryById, record).then((res) => {
+            console.log(88,res)
+            this.model = res.result
+            const b = res.result.files.map((res) => {
+              return res.url
+            })
+            this.model.files = b.join(',')
+            // this.model.cmmsUpkeepItemDtoList = this.model.cmmsUpkeepItemDtoList.map((res) => {
+            //   return {
+            //     id: id,
+            //     itemcode: res.itemcode,
+            //     itemname: res.itemname,
+            //     itemcontent: res.itemcontent,
+            //     remark: res.remark
+            //   }
+            // })
+        })
         this.visible = true;
       },
       submitForm () {
@@ -184,7 +255,17 @@
               method = 'post';
             }else{
               httpurl+=this.url.edit;
-               method = 'put';
+              method = 'put';
+            }
+            if (this.model.files.length != 0) {
+              const a  = this.model.files.split(',')
+              this.model.files = a.map((res) => {
+                return {
+                  url: res
+                }
+              })
+            }else{
+              this.model.files = []
             }
             httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
@@ -202,4 +283,8 @@
       },
     }
   }
-</script>
+</script>
+
+<style scoped>
+@import "~@/assets/less/uStyle.less";
+</style>

src/views/module_cmms/upkeep/modules/UpkeepModal.vue

@@ -1,15 +1,15 @@
 <template>
-  <j-modal
+  <u-modal
     :title="title"
     :width="width"
     :visible="visible"
-    switchFullscreen
+    contentFull
     @ok="handleOk"
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
     <upkeep-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></upkeep-form>
-  </j-modal>
+  </u-modal>
 </template>
 
 <script>

src/views/module_cmms/upkeepPlan/UpkeepPlanList.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="计划编号">
-              <a-input placeholder="请输入计划名称" v-model="queryParam.plancode"></a-input>
+              <a-input placeholder="请输入计划编号" v-model="queryParam.plancode"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">