处理日志改为维修记录

src/components/showModel/showModel.vue

@@ -47,18 +47,39 @@
           ></cube-select>
         </div>
         <div v-if="textName === 'textarea'">
-          <div class="tipsAll">
-            <div class="tips" v-for="item in logs" :key="item.id" @click="copyTo(item.value)">
-              {{ item.value }}
+          <div>
+            <div><span class="red">*</span>维修方式：</div>
+            <cube-select
+            v-model="maintenanceMode"
+            :options="modes"
+            placeholder="请选择维修方式"
+            style="margin:0.2rem 0;"
+          ></cube-select>
+          </div>
+          <div>
+            <div><span class="red">*</span>预估天数：</div>
+            <cube-select
+            v-model="estimatedNumberOfDays"
+            :options="days"
+            placeholder="请选择预估天数"
+            style="margin:0.2rem 0;"
+          ></cube-select>
+          </div>
+          <div>
+            <div><span class="red">*</span>备注：</div>
+            <cube-textarea
+              autofocus
+              :maxlength="255"
+              v-model="textareaData"
+              placeholder="请填写备注"
+              style="border:1px solid #ececec;height:2rem;resize:none;"
+            ></cube-textarea>
+            <div class="tipsAll">
+              <div class="tips" v-for="item in logs" :key="item.id" @click="copyTo(item.value)">
+                {{ item.value }}
+              </div>
             </div>
           </div>
-          <cube-textarea
-            autofocus
-            :maxlength="255"
-            v-model="textareaData"
-            placeholder="请填写处理日志"
-            style="border:1px solid #ececec;height:2rem;resize:none;"
-          ></cube-textarea>
         </div>
         <!-- 耗材 -->
         <div class="select-wrap hc" v-if="selectName === 'hc_add' || selectName === 'hc_edit'">
@@ -118,13 +139,36 @@ export default {
       selectBranchId: undefined, //select选中的数据-院区
       selectDataDuty: [], //select数据-责任科室
       selectDutyId: undefined, //select选中的数据-责任科室
-      textareaData: "" //textarea的数据
+      textareaData: "", //textarea的数据
+      maintenanceMode: "", //维修方式
+      estimatedNumberOfDays: "", //预估天数
+      modes: [],//维修方式列表
+      modesResource: [],//维修方式列表
+      days: [
+        {text: 1, value: 1},
+        {text: 2, value: 2},
+        {text: 3, value: 3},
+        {text: 4, value: 4},
+        {text: 5, value: 5},
+        {text: 6, value: 6},
+        {text: 7, value: 7},
+        {text: 8, value: 8},
+        {text: 9, value: 9},
+        {text: 10, value: 10},
+        {text: 11, value: 11},
+        {text: 12, value: 12},
+        {text: 13, value: 13},
+        {text: 14, value: 14},
+        {text: 15, value: 15},
+      ],//预估天数列表
     };
   },
   watch: {
     disjunctor(newValue) {
       if (newValue && this.textName === "textarea") {
         this.textareaData = "";
+        this.maintenanceMode = "";
+        this.estimatedNumberOfDays = "";
       }
       if (newValue && this.operate.know == "知道了") {
         this.time = 5;
@@ -174,7 +218,7 @@ export default {
       type: String,
       default: ""
     },
-    // 文本块(处理日志)
+    // 文本块(维修记录)
     textName: {
       type: String,
       default: ""
@@ -202,6 +246,16 @@ export default {
           this.logs = res.data.list.slice(0,2);
         });
     },
+    getModes() {
+      var postData = { idx: 0, sum: 999, dictionary: { key: "repair_type" } };
+      this.$http
+        .post("service/bpm/data/fetchDataList/dictionary", postData)
+        .then(res => {
+          res.data.list = res.data.list || [];
+          this.modes = res.data.list.map(v => ({text: v.name, value: v.id}));
+          this.modesResource = res.data.list;
+        });
+    },
     //选择组
     changeGroup(groupId) {
       this.getZpUser(groupId);
@@ -339,7 +393,7 @@ export default {
       } else if (this.selectName === "gs_edit") {
         this.$emit("ok", {gs: this.data.gs, workHourNum2:this.workHourNum2});
       } else if (this.textName === "textarea") {
-        this.$emit("ok", this.textareaData);
+        this.$emit("ok", {textareaData: this.textareaData, maintenanceMode: this.modesResource.find(v=> v.id == this.maintenanceMode), estimatedNumberOfDays: this.estimatedNumberOfDays});
       } else {
         this.$emit("ok");
       }
@@ -376,6 +430,7 @@ export default {
     }
     if (this.textName === "textarea") {
       this.getLogs();
+      this.getModes();
     }
   }
 };
@@ -390,17 +445,14 @@ export default {
   bottom: 0;
   background-color: rgba(0, 0, 0, 0.2);
   z-index: 99;
+  .red{
+    color: red;
+  }
 
   .tipsAll {
-    display: flex;
-    flex-wrap: wrap;
     .tips {
       word-break: break-all;
       margin-bottom: 0.1rem;
-      margin-left: 0.2rem;
-      &:first-of-type {
-        margin-left: 0;
-      }
     }
   }
 

src/views/againAssign.vue

@@ -233,7 +233,7 @@ export default {
         .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          //处理日志startcaca
+          //维修记录startcaca
           if (that.model.incident.handlerLogs) {
             //添加日志
             that.model.incident.handlerLogs.forEach((v) => {
@@ -262,7 +262,7 @@ export default {
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
           console.log(that.progressInfo);
-          //处理日志end
+          //维修记录end
         });
     },
     //隐藏显示详情

src/views/closed.vue

@@ -286,7 +286,7 @@ export default {
         .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          //处理日志startcaca
+          //维修记录startcaca
           if (that.model.incident.handlerLogs) {
             //添加日志
             that.model.incident.handlerLogs.forEach((v) => {
@@ -315,7 +315,7 @@ export default {
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
           console.log(that.progressInfo);
-          //处理日志end
+          //维修记录end
         });
     },
     //隐藏显示详情

src/views/grabSheet.vue

@@ -194,7 +194,7 @@ export default {
         .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          //处理日志startcaca
+          //维修记录startcaca
           if (that.model.incident.handlerLogs) {
             //添加日志
             that.model.incident.handlerLogs.forEach((v) => {
@@ -223,7 +223,7 @@ export default {
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
           console.log(that.progressInfo);
-          //处理日志end
+          //维修记录end
         });
     },
     //隐藏显示详情

src/views/handlerLog.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="handlerLog">
-  <div class="label">处理日志</div>
+  <div class="label">维修记录</div>
   <table class="handlerLog__table">
     <tr>
       <td class="xh">序号</td>

src/views/incidentList.vue

@@ -117,7 +117,7 @@
                     v-show="item.state.id === 1544"
                   >
                     <cube-button @click.stop="addHandlerLog(item)"
-                      >新增处理日志</cube-button
+                      >新增维修记录</cube-button
                     >
                   </cube-form-group>
                 </div>
@@ -171,7 +171,7 @@
       :operate="models.operate"
       selectName="user"
     ></showModel>
-    <!-- 新增处理日志弹窗 -->
+    <!-- 新增维修记录弹窗 -->
     <showModel
       :title="models1.title"
       :icon="models1.icon"
@@ -380,12 +380,28 @@ export default {
       };
     },
     //确定
-    ok1(text) {
-      console.log(text);
-      if (!text.trim()) {
+    ok1(obj) {
+      console.log(obj);
+      if (!obj.maintenanceMode) {
         this.$createDialog({
           type: "alert",
-          title: "请填写处理日志",
+          title: "请选择维修方式",
+          icon: "cubeic-warn"
+        }).show();
+        return;
+      }
+      if (!obj.estimatedNumberOfDays) {
+        this.$createDialog({
+          type: "alert",
+          title: "请选择预估天数",
+          icon: "cubeic-warn"
+        }).show();
+        return;
+      }
+      if (!obj.textareaData.trim()) {
+        this.$createDialog({
+          type: "alert",
+          title: "请填写维修记录",
           icon: "cubeic-warn"
         }).show();
         return;
@@ -399,8 +415,10 @@ export default {
         .post("service/bpm/data/addData/operationLog", {
           operationLog: {
             opType: "handlerLog",
-            opValue: text,
-            extra1: this.modelsData1.id
+            opValue: obj.textareaData,
+            extra1: this.modelsData1.id,
+            repairType: obj.maintenanceMode,
+            expectedDay: obj.estimatedNumberOfDays,
           }
         })
         .then(res => {
@@ -437,12 +455,12 @@ export default {
     cancel1() {
       this.models1.disjunctor = false;
     },
-    // 新增处理日志
+    // 新增维修记录
     addHandlerLog(item) {
       this.modelsData1 = item;
       this.models1 = {
         disjunctor: true,
-        title: "新增处理日志",
+        title: "新增维修记录",
         icon: "warn",
         operate: {
           ok: "确定",

src/views/order.vue

@@ -32,7 +32,7 @@
                 :class="{active:actives=='handlerLog'}"
                 href="javascript:;"
                 @click="toInfo('handlerLog')"
-              >处理日志</a>
+              >维修记录</a>
             </div> -->
             <div
               class="fl"
@@ -240,7 +240,7 @@ export default {
         .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          //处理日志startcaca
+          //维修记录startcaca
           if (that.model.incident.handlerLogs) {
             //添加日志
             that.model.incident.handlerLogs.forEach((v) => {
@@ -269,7 +269,7 @@ export default {
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
           console.log(that.progressInfo);
-          //处理日志end
+          //维修记录end
         });
     },
     //隐藏显示详情

src/views/processing.vue

@@ -23,7 +23,7 @@
               :class="{ active: actives == 'handlerLog' }"
               href="javascript:;"
               @click="toInfo('handlerLog')"
-              >处理日志</a>
+              >维修记录</a>
           </div> -->
           <div
             class="fl"
@@ -295,7 +295,7 @@
                       <textarea
                         style="margin-top:0.1rem;width:100%;"
                         class="titleTxtArea fl"
-                        placeholder="请输入处理日志"
+                        placeholder="请输入维修记录"
                         v-model="handlerLog"
                       ></textarea>
                     </div>
@@ -468,7 +468,7 @@ export default {
         incident: {}
       }, //上传的model
       incidentTitle: "", //处理方案
-      handlerLog: "", //处理日志
+      handlerLog: "", //维修记录
       referenceInfo: {}, //引用信息
       selectedCategoryTxt: "", //事件分类选中展示
       selectedAreaId: "", //区域选中id--seimin
@@ -754,9 +754,9 @@ export default {
         {
           type: "textarea",
           modelKey: "handlerLog",
-          label: "处理日志:",
+          label: "维修记录:",
           props: {
-            placeholder: "请填写处理日志"
+            placeholder: "请填写维修记录"
           },
           rules: {
             required: false
@@ -1081,7 +1081,7 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          //处理日志startcaca
+          //维修记录startcaca
           if (that.modelData.incident.handlerLogs) {
             //添加日志
             that.modelData.incident.handlerLogs.forEach(v => {
@@ -1110,7 +1110,7 @@ export default {
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
           console.log(that.progressInfo);
-          //处理日志end
+          //维修记录end
         });
     },
     //隐藏显示详情
@@ -1779,7 +1779,7 @@ export default {
     },
     handlerFn() {
       let that = this;
-      //填写了处理日志，并且是处理中状态
+      //填写了维修记录，并且是处理中状态
       if (
         that.handlerLog &&
         that.handlerLog.trim() &&

src/views/solved.vue

@@ -25,7 +25,7 @@
               :class="{ active: actives == 'handlerLog' }"
               href="javascript:;"
               @click="toInfo('handlerLog')"
-              >处理日志</a
+              >维修记录</a
             >
           </div> -->
           <div class="fl">
@@ -319,7 +319,7 @@ export default {
         .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          //处理日志startcaca
+          //维修记录startcaca
           if (that.model.incident.handlerLogs) {
             //添加日志
             that.model.incident.handlerLogs.forEach((v) => {
@@ -348,7 +348,7 @@ export default {
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
           console.log(that.progressInfo);
-          //处理日志end
+          //维修记录end
         });
     },
     // 获取结果类型