bug 修改

public/index.html

@@ -34,7 +34,7 @@
     // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
     // window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
     // window.staticHost = 'http://192.168.0.103:9600/';
-    window.staticHost = 'http://43.138.50.94:9600/';
+    window.staticHost = 'http://43.138.50.94:9600';
 
     // document.title = "hello";
   </script>

src/components/workflowBase.vue

@@ -276,7 +276,6 @@ export default {
         content: this.textarea, //意见内容
       };
       if (this.manyPeopleStatus == true) {
-        console.log('[ 是否多人处理 ] >', this.list)
         list.procinstid = this.list.process_id;
         // if (this.backThree.length <= 1) {
         // this.$message.error("请选择多人");
@@ -332,7 +331,7 @@ export default {
               list.nextDealMan = this.backThree[0].loginNoStr;
             }
           } else {
-            if (this.clicknextName === "流程结束") {
+            if (this.clicknextName === "结束") {
             } else {
               this.$message.error("请选择候选人");
               return false;
@@ -539,6 +538,7 @@ export default {
       this.TransferStatus = false;
       //   this.clickTaskName = e.properties.name;
       this.clicknextName = e.properties.name;
+      console.log(this.clicknextName);
       this.seleIndex = index;
       this.getNextPath(e.resourceId, 3); //1 为点击后获取线
     },

src/pages/main/postage/formTable.vue

@@ -2,43 +2,22 @@
   <div>
     <div>
       <div class="flex-title">资费配置工单</div>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rule"
-        :disabled="disabled"
-        label-width="200px"
-      >
+      <el-form ref="form" :model="form" :rules="rule" :disabled="disabled" label-width="200px">
         <div class="flex-header">
-          <el-form-item
-            style="width: 42%"
-            label="文件标题:"
-            prop="needName"
-            label-width="140px"
-          >
+          <el-form-item style="width: 42%" label="文件标题:" prop="needName" label-width="140px">
             <el-input v-model="form.needName"></el-input>
           </el-form-item>
           <el-form-item label="申请部门:" prop="applydept">
             <el-input v-model="form.applydept" :disabled="true"></el-input>
           </el-form-item>
           <el-form-item label="申请科室:" prop="applydepartment">
-            <el-input
-              v-model="form.applydepartment"
-              :disabled="true"
-            ></el-input>
+            <el-input v-model="form.applydepartment" :disabled="true"></el-input>
           </el-form-item>
         </div>
         <div class="flex-header">
           <el-form-item label="拟稿时间:">
-            <el-date-picker
-              type="date"
-              :disabled="true"
-              placeholder="选择日期"
-              v-model="form.proposerTime"
-              :picker-options="pickerOptions"
-              value-format="yyyy-MM-dd"
-              style="width: 100%"
-            ></el-date-picker>
+            <el-date-picker type="date" :disabled="true" placeholder="选择日期" v-model="form.proposerTime"
+              :picker-options="pickerOptions" value-format="yyyy-MM-dd" style="width: 100%"></el-date-picker>
           </el-form-item>
           <el-form-item label="拟稿人:" prop="proposer">
             <el-input v-model="form.proposer" :disabled="true"></el-input>
@@ -59,21 +38,13 @@
               <el-option label="资费修改" value="资费修改"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="业务线条:"
-            prop="businessLine"
-            label-width="200px"
-          >
+          <el-form-item label="业务线条:" prop="businessLine" label-width="200px">
             <el-select v-model="form.businessLine" placeholder="请选择">
               <el-option label="市场线条" value="是"></el-option>
               <el-option label="政企线条" value="否"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="宽带配置选项:"
-            prop="isSevenProject"
-            label-width="220px"
-          >
+          <el-form-item label="宽带配置选项:" prop="isSevenProject" label-width="220px">
             <el-select v-model="form.broadband" placeholder="请选择">
               <el-option label="是" value="是"></el-option>
               <el-option label="无" value="否"></el-option>
@@ -87,15 +58,8 @@
         <div v-if="newPostAge">
           <div class="flex-header">
             <el-form-item label="需求时限:">
-              <el-date-picker
-                type="date"
-                :disabled="timeStatus"
-                placeholder="选择日期"
-                v-model="form.demandTime"
-                :picker-options="pickerOptions"
-                value-format="yyyy-MM-dd"
-                style="width: 100%"
-              ></el-date-picker>
+              <el-date-picker type="date" :disabled="timeStatus" placeholder="选择日期" v-model="form.demandTime"
+                :picker-options="pickerOptions" value-format="yyyy-MM-dd" style="width: 100%"></el-date-picker>
             </el-form-item>
             <el-form-item label="资费名称:" prop="proposer">
               <el-input v-model="form.tariffName"></el-input>
@@ -103,55 +67,27 @@
           </div>
           <div class="flex-input-tare flex-header">
             <el-form-item label="资费描述" prop="tariffDesc">
-              <el-input
-                type="textarea"
-                maxlength="300"
-                show-word-limit
-                v-model="form.tariffDesc"
-              ></el-input>
+              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.tariffDesc"></el-input>
             </el-form-item>
           </div>
           <div class="flex-header">
-            <el-form-item
-              label="费用收取方式:"
-              prop="costPayWay"
-              label-width="220px"
-            >
+            <el-form-item label="费用收取方式:" prop="costPayWay" label-width="220px">
               <el-select v-model="form.costPayWay" placeholder="请选择">
-                <el-option
-                  label="费用一次性收取"
-                  value="费用一次性收取"
-                ></el-option>
+                <el-option label="费用一次性收取" value="费用一次性收取"></el-option>
                 <el-option label="按日分摊" value="按日分摊"></el-option>
-                <el-option
-                  label="区分上下半月"
-                  value="区分上下半月"
-                ></el-option>
-                <el-option
-                  label="不区分上下半月"
-                  value="不区分上下半月"
-                ></el-option>
+                <el-option label="区分上下半月" value="区分上下半月"></el-option>
+                <el-option label="不区分上下半月" value="不区分上下半月"></el-option>
                 <el-option label="月租日计" value="月租日计"></el-option>
                 <el-option label="其他" value="其他"></el-option>
               </el-select>
             </el-form-item>
             <div class="flex-textarea">
-              <el-input
-                type="textarea"
-                maxlength="300"
-                show-word-limit
-                v-model="form.costPayWayInput"
-              ></el-input>
+              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.costPayWayInput"></el-input>
             </div>
           </div>
           <div class="flex-input-tare flex-header">
             <el-form-item label="办理场景" prop="handleWay">
-              <el-input
-                type="textarea"
-                maxlength="300"
-                show-word-limit
-                v-model="form.handleWay"
-              ></el-input>
+              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.handleWay"></el-input>
             </el-form-item>
           </div>
           <div class="flex-header" style="justify-content: space-between;">
@@ -166,20 +102,15 @@
                 <el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
               </el-checkbox-group>
             </el-form-item> -->
-            <el-form-item
-              label="提醒短信:"
-              prop="remindMmsg"
-              label-width="220px"
-              style="width: 33%;"
-            >
+            <el-form-item label="提醒短信:" prop="remindMmsg" label-width="220px" style="width: 33%;">
               <el-checkbox-group v-model="remindMmsg" style="display:flex">
-                <el-checkbox label="无" name="remindMmsg"></el-checkbox>
-                <el-checkbox label="到期提醒" name="remindMmsg"></el-checkbox>
-                <el-checkbox label="办理成功" name="remindMmsg" ></el-checkbox>
-                <el-checkbox label="退订成功" name="remindMmsg"></el-checkbox>
-                <el-checkbox label="限速提醒" name="remindMmsg"></el-checkbox>
-                <el-checkbox label="余额提醒" name="remindMmsg"></el-checkbox>
-                <el-checkbox label="用尽失效" name="remindMmsg"></el-checkbox>
+                <el-checkbox label="无" name="remindMmsg" :disabled="checkBoxNone"></el-checkbox>
+                <el-checkbox label="到期提醒" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
+                <el-checkbox label="办理成功" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
+                <el-checkbox label="退订成功" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
+                <el-checkbox label="限速提醒" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
+                <el-checkbox label="余额提醒" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
+                <el-checkbox label="用尽失效" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <!-- <el-form-item
@@ -202,12 +133,7 @@
               </el-select>
             </el-form-item> -->
             <div class="flex-textarea" style="margin-right:5%;width:60%">
-              <el-input
-                type="textarea"
-                maxlength="300"
-                show-word-limit
-                v-model="form.remindMsgInput"
-              ></el-input>
+              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.remindMsgInput"></el-input>
             </div>
           </div>
           <div class="flex-header">
@@ -218,90 +144,46 @@
               </el-select>
             </el-form-item>
             <div class="flex-textarea">
-              <el-input
-                type="textarea"
-                maxlength="300"
-                show-word-limit
-                v-model="form.gratuityInput"
-              ></el-input>
+              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.gratuityInput"></el-input>
             </div>
           </div>
           <div class="flex-header">
-            <el-form-item
-              label="报表要求:"
-              prop="reportForm"
-              label-width="220px"
-            >
+            <el-form-item label="报表要求:" prop="reportForm" label-width="220px">
               <el-select v-model="form.reportForm" placeholder="请选择">
                 <el-option label="无" value="无"></el-option>
                 <el-option label="有" value="有"></el-option>
               </el-select>
             </el-form-item>
             <div class="flex-textarea">
-              <el-input
-                type="textarea"
-                maxlength="300"
-                show-word-limit
-                v-model="form.reportFormInput"
-              ></el-input>
+              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.reportFormInput"></el-input>
             </div>
           </div>
           <div class="flex-input-tare flex-header">
             <el-form-item label="工单协议条款内容调整" prop="clause">
-              <el-input
-                type="textarea"
-                maxlength="500"
-                show-word-limit
-                v-model="form.clause"
-              ></el-input>
+              <el-input type="textarea" maxlength="500" show-word-limit v-model="form.clause"></el-input>
             </el-form-item>
           </div>
           <div class="flex-input-tare flex-header">
             <el-form-item label="备注/内容" prop="needBackdrop">
-              <el-input
-                type="textarea"
-                maxlength="500"
-                show-word-limit
-                v-model="form.content"
-              ></el-input>
+              <el-input type="textarea" maxlength="500" show-word-limit v-model="form.content"></el-input>
             </el-form-item>
           </div>
         </div>
         <div v-if="postEdit">
           <div class="flex-input-tare flex-header">
             <el-form-item label="内容" prop="count">
-              <el-input
-                type="textarea"
-                maxlength="300"
-                show-word-limit
-                v-model="form.count"
-              ></el-input>
+              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.count"></el-input>
             </el-form-item>
           </div>
           <div class="flex-input-tare flex-header">
             <el-form-item label="资费工单协议条款内容调整" prop="clause">
-              <el-input
-                type="textarea"
-                maxlength="500"
-                show-word-limit
-                v-model="form.clause"
-              ></el-input>
+              <el-input type="textarea" maxlength="500" show-word-limit v-model="form.clause"></el-input>
             </el-form-item>
           </div>
         </div>
-        <el-form-item
-          label="附件："
-          prop="mkFileShareAttachList"
-          label-width="120px"
-        >
-          <my-upload
-            ref="upload"
-            @uploadBack="uploadBack"
-            @delloadBack="delloadBack"
-            @clickDownload="download"
-            :fileInfo="fileInfo"
-            :fileList="list.mkFileShareAttachList"
-          ></my-upload>
+        <el-form-item label="附件：" prop="mkFileShareAttachList" label-width="120px">
+          <my-upload ref="upload" @uploadBack="uploadBack" @delloadBack="delloadBack" @clickDownload="download"
+            :fileInfo="fileInfo" :fileList="list.mkFileShareAttachList"></my-upload>
         </el-form-item>
       </el-form>
     </div>
@@ -319,6 +201,8 @@ export default {
   },
   data() {
     return {
+      checkBoxNone: false,
+      checkBoxStatus: false,
       fileInfo: {
         type: "bt1n",
         typename: "上传文件",
@@ -353,17 +237,17 @@ export default {
       rule: {},
       copyRule: {},
       isList: [],
-      remindMmsg:['无']
+      remindMmsg: []
     };
   },
   props: {
     list: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
     disabled: {
       type: Boolean,
-      default: () => {},
+      default: () => { },
     },
   },
   mounted() {
@@ -495,9 +379,24 @@ export default {
         }
       },
     },
-    "remindMmsg":{
+    "remindMmsg": {
       handler(newVal) {
         this.form.remindMmsg = newVal;
+        if (newVal.length === 0) {
+          this.checkBoxStatus = false;
+          this.checkBoxNone = false;
+        }
+        newVal.map((item) => {
+          if (item === '无') {
+            this.checkBoxStatus = !this.checkBoxNone;
+            console.log(this.checkBoxStatus);
+          } else {
+            this.checkBoxNone = !this.checkBoxStatus
+          }
+
+
+        })
+
       }
     }
   },
@@ -508,9 +407,11 @@ export default {
 a {
   text-decoration: none;
 }
+
 ::v-deep .el-upload-list {
   width: 23rem;
 }
+
 .flex-title {
   text-align: center;
   font-size: 24px;
@@ -518,6 +419,7 @@ a {
 
   font-weight: bold;
 }
+
 .flex-header {
   margin-top: 20px;
   display: flex;
@@ -528,38 +430,47 @@ a {
     margin-right: 60px;
   }
 }
+
 .flex-upload {
   ::v-deep .el-form-item {
     width: 100%;
   }
 }
+
 .flex-input-tare {
   ::v-deep .el-form-item {
     width: 100%;
     margin-right: 5%;
   }
+
   ::v-deep .el-form-item__label {
     width: 9rem !important;
   }
 }
+
 .flex-textarea {
   width: 72.7%;
 }
+
 .el-upload__tip {
   color: red;
 }
+
 // ::v-deep .el-input--suffix .el-input__inner {
 //   width: 119% !important;
 // }
 ::v-deep .el-input__inner {
   color: black !important;
 }
+
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: black !important;
 }
+
 ::v-deep .el-form-item {
   display: flex;
 }
+
 ::v-deep .el-form-item__label {
   // width:100%;
   height: 50px;
@@ -567,17 +478,22 @@ a {
   width: 130px;
   font-size: 0.5rem;
 }
+
 ::v-deep .el-form-item__content {
   width: 100%;
   margin-left: 0% !important;
 }
+
 .el-select,
 ::v-deep.el-input_inner {
   width: 100%;
 }
+
 ::v-deep.el-form-item.foldLabel .el-form-item__label {
-  white-space: pre-line; /*换行显示*/
-  height: 10px; /*设置lable高度，input高度一样*/
+  white-space: pre-line;
+  /*换行显示*/
+  height: 10px;
+  /*设置lable高度，input高度一样*/
   line-height: 30px !important;
 }
 </style>

src/pages/main/postage/index.vue

@@ -6,42 +6,19 @@
       <el-button type="primary" @click="clickNewTag">+新建</el-button>
     </div>
     <div class="flex-count">
-      <Table
-        @clickDemand="clickDemand"
-        :list="lableTable"
-        ref="TableList"
-        @num="getNum"
-        @changeNum="changeNum"
-      >
+      <Table @clickDemand="clickDemand" :list="lableTable" ref="TableList" @num="getNum" @changeNum="changeNum">
       </Table>
     </div>
-    <el-dialog
-      :title="'需求'"
-      :visible.sync="dialogStatus"
-      width="100%"
-      :before-close="handleClose"
-      :modal="false"
-      v-if="dialogStatus"
-      style="display: flex; flex-direction: column"
-      :destroy-on-close="true"
-    >
+    <el-dialog :title="'需求'" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
+      v-if="dialogStatus" style="display: flex; flex-direction: column" :destroy-on-close="true">
       <!-- 后期维护 -->
       <div style="position: fixed; z-index: 10000">
-        <el-button type="primary" v-if="startStatus" @click="clickHandles"
-          >处理</el-button
-        >
+        <el-button type="primary" v-if="startStatus" @click="clickHandles">处理</el-button>
         <el-button type="primary" @click="handleClose">关闭</el-button>
-        <el-button type="primary" @click="clickSave" v-if="saveStatus"
-          >保存</el-button
-        >
+        <el-button type="primary" @click="clickSave" v-if="saveStatus">保存</el-button>
       </div>
 
-      <FormTable
-        :list="fromList"
-        :disabled="disabled"
-        class="flex-form"
-        ref="formTable"
-      />
+      <FormTable :list="fromList" :disabled="disabled" class="flex-form" ref="formTable" />
       <div>
         <div class="table-title">流程追踪</div>
         <div v-if="abc == true">
@@ -56,30 +33,12 @@
       </div>
     </el-dialog>
     <div v-if="destroy">
-      <el-dialog
-        title="处理操作"
-        width="100%"
-        :visible.sync="handleStatus"
-        :before-close="handleCloses"
-        :modal="false"
-        v-if="handleStatus"
-        :destroy-on-close="true"
-      >
-        <Workflow
-          ref="workflow"
-          :list="fromList"
-          v-if="isWorkflowStatus == true"
-          @updateForm="beforeClose"
-          :requestForm="requestForm"
-          :adminResourceId="adminResourceId"
-        />
-        <WorkflowEntrance
-          :list="fromList"
-          v-else
-          :lastManList="lastManList"
-          @beforeClose="beforeClose"
-          :requestForm="requestForm"
-        />
+      <el-dialog title="处理操作" width="100%" :visible.sync="handleStatus" :before-close="handleCloses" :modal="false"
+        v-if="handleStatus" :destroy-on-close="true">
+        <Workflow ref="workflow" :list="fromList" v-if="isWorkflowStatus == true" @updateForm="beforeClose"
+          :requestForm="requestForm" :adminResourceId="adminResourceId" />
+        <WorkflowEntrance :list="fromList" v-else :lastManList="lastManList" @beforeClose="beforeClose"
+          :requestForm="requestForm" />
 
         <!-- 后期维护 -->
       </el-dialog>
@@ -209,7 +168,7 @@ export default {
             {
               label: "操作", // 操作名称
               type: "", //按钮类型
-              handleRow: (e, r, o) => {}, // 自定义事件
+              handleRow: (e, r, o) => { }, // 自定义事件
             },
           ],
         },
@@ -274,7 +233,7 @@ export default {
             {
               label: "操作", // 操作名称
               type: "", //按钮类型
-              handleRow: (e, r, o) => {}, // 自定义事件
+              handleRow: (e, r, o) => { }, // 自定义事件
             },
           ],
         },
@@ -333,7 +292,7 @@ export default {
             {
               label: "操作", // 操作名称
               type: "", //按钮类型
-              handleRow: (e, r, o) => {}, // 自定义事件
+              handleRow: (e, r, o) => { }, // 自定义事件
             },
           ],
         },
@@ -399,7 +358,7 @@ export default {
             {
               label: "操作", // 操作名称
               type: "", //按钮类型
-              handleRow: function () {}, // 自定义事件
+              handleRow: function () { }, // 自定义事件
             },
           ],
         },
@@ -631,15 +590,19 @@ export default {
     },
     setUpdate(e) {
       updateBase(e).then((res) => {
-        console.log(res);
         this.fromList = res.data.body[0];
         // this.fromList = concat;
       });
     },
     //点击保存
     clickSave() {
-      this.getUserIds();
-      this.setForm();
+      if (this.fromList.id) {
+        this.setUpdate(this.$refs.formTable.form)
+      } else {
+        this.getUserIds();
+        this.setForm();
+      }
+
       // this.$refs.formTable.$refs.form.validate((valid) => {
       //   if (valid) {
       //     if (this.fromList.id) {
@@ -678,6 +641,7 @@ export default {
         data: { id: e.id },
       }).then((res) => {
         // this.dialogStatus = true;
+        this.fromList = res.data
         this.fromList.mkFileShareAttachList = res.data.mkFileShareAttachList;
         this.dialogStatus = true;
       });
@@ -799,17 +763,18 @@ export default {
             this.saveStatus = false;
           }
         }
-        res.needName = res.need_name;
-        this.fromList = res;
+        // console.log('[ res ] >', res)
+        // res.needName = res.need_name;
+        // this.fromList = res;
 
-        console.log(res);
+        // console.log(res);
         // this.disabled = true
 
         this.clickForm(res);
         this.getFromQuery(res);
       }
     },
-    getNum() {},
+    getNum() { },
     getCurrentPageList(e) {
       this.totalPage = Math.ceil(e.length / this.pageSize);
       this.totalPage = this.totalPage == 0 ? 1 : this.totalPage;
@@ -884,19 +849,24 @@ export default {
   background-color: #d8eaf6;
   color: black;
 }
+
 ::v-deep .is-active {
   color: #fff;
   background-color: #0583cd;
 }
+
 ::v-deep .el-tabs__active-bar {
   display: none;
 }
+
 ::v-deep .el-tabs__nav-wrap::after {
   display: none !important;
 }
+
 .flex-form {
   margin-top: 50px;
 }
+
 .flex-box {
   display: flex;
   // overflow: auto;
@@ -909,6 +879,7 @@ export default {
   margin-top: 20px;
   position: relative;
   flex-direction: column;
+
   // height: 100%;
   .flex-header {
     display: flex;
@@ -918,6 +889,7 @@ export default {
     margin: 1%;
     border-bottom: 1px solid #e1e1e1;
     justify-content: space-between;
+
     .el-button {
       width: 150px;
       float: right;