保养计划和保养工单优化

src/views/module_cmms/upkeep/UpkeepList.vue

@@ -179,7 +179,7 @@
           {
             title:'负责人',
             align:"center",
-            dataIndex: 'chargeruser_dict'
+            dataIndex: 'chargeruser_dictText'
           },
           // {
           //   title:'描述',
@@ -187,9 +187,9 @@
           //   dataIndex: 'upkeepdesc'
           // },
           {
-            title:'状态：0待处理、1已通知、2未执行、3未完成、4已完成',
+            title:'状态',
             align:"center",
-            dataIndex: 'status_dict'
+            dataIndex: 'status_dictText'
           },
           {
             title:'备注',
@@ -231,6 +231,11 @@
       },
     },
     methods: {
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "反馈";
+        this.$refs.modalForm.disableSubmit = false;
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

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

@@ -3,84 +3,93 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+          <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> -->
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="保养工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepcode">
-              <a-input v-model="model.upkeepcode" placeholder="请输入保养工单编号"  ></a-input>
+          <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> -->
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="12">
             <a-form-model-item label="保养名称(标题)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepname">
               <a-input v-model="model.upkeepname" placeholder="请输入保养名称(标题)"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="保养计划ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepplanid">
               <a-input v-model="model.upkeepplanid" placeholder="请输入保养计划ID"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="保养工作项目ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepprojid">
               <a-input v-model="model.upkeepprojid" placeholder="请输入保养工作项目ID"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="工作项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectname">
               <a-input v-model="model.projectname" placeholder="请输入工作项目名称"  ></a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="计划名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planname">
-              <a-input v-model="model.planname" placeholder="请输入计划名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
+          </a-col> -->
+          <a-col :span="12">
             <a-form-model-item label="地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-input v-model="model.address" placeholder="请输入地点"  ></a-input>
+              {{model.address}}
+              <!-- <a-input v-model="model.address" placeholder="请输入地点"  ></a-input> -->
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="12">
             <a-form-model-item label="厂商名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplier">
               <a-input v-model="model.supplier" placeholder="请输入厂商名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="厂商电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="suppliertel">
               <a-input v-model="model.suppliertel" placeholder="请输入厂商电话"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linker">
               <a-input v-model="model.linker" placeholder="请输入联系人"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="联系人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="linkertel">
               <a-input v-model="model.linkertel" placeholder="请输入联系人电话"  ></a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
+          </a-col> -->
+          <a-col :span="12">
             <a-form-model-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeruser">
-              <a-input v-model="model.chargeruser" placeholder="请输入负责人"  ></a-input>
+              {{model.chargeruser_dictText}}
+              <!-- <j-dict-select-tag v-model="model.chargeruser" placeholder="请选择负责人" dictCode="sys_user,realname,id"/> -->
             </a-form-model-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <!-- <a-input v-model="model.status" placeholder="请输入状态：0待处理、1已通知、2未执行、3未完成、4已完成"  ></a-input> -->
+              <j-dict-select-tag v-model="model.status" placeholder="请选择状态" dictCode="upkeep_state"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+          </a-col>
           <a-col :span="24">
-            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepdesc">
-              <a-input v-model="model.upkeepdesc" placeholder="请输入描述"  ></a-input>
+            <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="状态：0待处理、1已通知、2未执行、3未完成、4已完成" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input v-model="model.status" placeholder="请输入状态：0待处理、1已通知、2未执行、3未完成、4已完成"  ></a-input>
+            <a-form-model-item label="处理意见" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="opinion">
+              <a-textarea v-model="model.opinion" placeholder="请输入处理意见"  :auto-size="{ minRows: 2, maxRows: 2 }"></a-textarea>
+              <!-- <a-input v-model="model.opinion" placeholder="请输入处理意见"  ></a-input> -->
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="处理意见" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="opinion">
-              <a-input v-model="model.opinion" placeholder="请输入处理意见"  ></a-input>
+            <a-form-model-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="remark">
+              <a-textarea v-model="model.remark" placeholder="请输入备注"  :auto-size="{ minRows: 2, maxRows: 2 }"></a-textarea>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -112,14 +121,31 @@
          },
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 8 },
         },
         wrapperCol: {
           xs: { span: 24 },
-          sm: { span: 16 },
+          sm: { span: 13 },
+        },
+        labelCol2: {
+          xs: { span: 24 },
+          sm: { span: 4 },
+        },
+        wrapperCol2: {
+          xs: { span: 24 },
+          sm: { span: 18 },
         },
         confirmLoading: false,
         validatorRules: {
+          status: [
+            { required: true, message: '请选择状态!'},
+          ],
+          upkeepdesc: [
+            { required: true, message: '请输入描述!'},
+          ],
+          opinion: [
+            { required: true, message: '请输入处理意见!'},
+          ],
         },
         url: {
           add: "/cmmsUpkeep/cmmsUpkeep/add",

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

@@ -23,7 +23,7 @@
     data () {
       return {
         title:'',
-        width:800,
+        width:1000,
         visible: false,
         disableSubmit: false
       }

src/views/module_cmms/upkeepPlan/modules/UpkeepPlanForm.vue

@@ -65,7 +65,7 @@
               </a-col>
               <a-col :span="12">
                 <a-form-model-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeruser">
-                  <j-dict-select-tag v-model="model.chargeruser" placeholder="请输入负责人" dictCode="sys_user,realname,id"/>
+                  <j-dict-select-tag v-model="model.chargeruser" placeholder="请选择负责人" dictCode="sys_user,realname,id"/>
                 </a-form-model-item>
               </a-col>
               <a-col :span="12">