merge

src/pages/main/postage/formTable.vue

@@ -2,170 +2,244 @@
   <div>
     <div>
       <div class="flex-title">资费配置工单</div>
-      <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-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-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-form-item>
-          <el-form-item label="拟稿人:" prop="proposer">
-            <el-input v-model="form.proposer" :disabled="true"></el-input>
-          </el-form-item>
-          <el-form-item label="编号:" prop="fileno">
-            <el-input v-model="form.fileno" :disabled="true"></el-input>
-          </el-form-item>
+      <el-form ref="form" :model="form" :rules="rule" :disabled="disabled">
+        <el-row>
+          <el-col :span="12">
 
-          <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="form.phone" :disabled="true"></el-input>
-          </el-form-item>
-        </div>
-
-        <div class="flex-header">
-          <el-form-item label="操作类型:" prop="operationType">
-            <el-select v-model="form.operationType" placeholder="请选择">
-              <el-option label="新资费配置" value="新资费配置"></el-option>
-              <el-option label="资费修改" value="资费修改"></el-option>
-            </el-select>
-          </el-form-item>
-          <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-select v-model="form.broadband" placeholder="请选择">
-              <el-option label="是" value="是"></el-option>
-              <el-option label="无" value="否"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="资费价格:" prop="proposer">
-            <el-input v-model="form.tariffPrice"></el-input>
-          </el-form-item>
-        </div>
-        <!-- 新资费配置显示表单 -->
-        <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-form-item label="文件标题:" prop="needName">
+              <el-input v-model="form.needName"></el-input>
             </el-form-item>
-            <el-form-item label="资费名称:" prop="proposer">
-              <el-input v-model="form.tariffName"></el-input>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请部门:" prop="applydept">
+              <el-input v-model="form.applydept" :disabled="true"></el-input>
             </el-form-item>
-          </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-col>
+          <el-col :span="6">
+
+            <el-form-item label="申请科室:" prop="applydepartment">
+              <el-input v-model="form.applydepartment" :disabled="true"></el-input>
             </el-form-item>
-          </div>
-          <div class="flex-header">
-            <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-select>
+          </el-col>
+
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="6">
+            <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-form-item>
-            <div class="flex-textarea">
-              <el-form-item prop="costPayWayInput" style="width:100%">
-                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.costPayWayInput"></el-input>
-              </el-form-item>
-              
-            </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-col>
+          <el-col :span="6">
+
+            <el-form-item label="拟稿人:" prop="proposer">
+              <el-input v-model="form.proposer" :disabled="true"></el-input>
             </el-form-item>
-          </div>
-          <div class="flex-header" style="justify-content: space-between;">
-  
-            <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" :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-col>
+          <el-col :span="6">
+
+            <el-form-item label="编号:" prop="fileno">
+              <el-input v-model="form.fileno" :disabled="true"></el-input>
             </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>
-            </div>
-          </div>
-          <div class="flex-header">
-            <el-form-item label="酬金要求:" prop="gratuity" label-width="220px">
-              <el-select v-model="form.gratuity" placeholder="请选择">
-                <el-option label="无" value="无"></el-option>
-                <el-option label="有" value="有"></el-option>
-              </el-select>
+          </el-col>
+
+
+          <el-col :span="6">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" :disabled="true"></el-input>
             </el-form-item>
-            <div class="flex-textarea">
-              <el-form-item prop="gratuityInput" style="width:100%">
-                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.gratuityInput"></el-input>
-              </el-form-item>
 
-            </div>
-          </div>
-          <div class="flex-header">
-            <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-col>
+
+
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+
+            <el-form-item label="操作类型:" prop="operationType">
+              <el-select v-model="form.operationType" placeholder="请选择">
+                <el-option label="新资费配置" value="新资费配置"></el-option>
+                <el-option label="资费修改" value="资费修改"></el-option>
               </el-select>
             </el-form-item>
-            <div class="flex-textarea">
-              <el-form-item prop="reportFormInput" style="width:100%">
-                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.reportFormInput"></el-input>
-              </el-form-item>
+          </el-col>
+          <el-col :span="6">
 
-            </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-form-item label="业务线条:" prop="businessLine">
+              <el-select v-model="form.businessLine" placeholder="请选择">
+                <el-option label="市场线条" value="是"></el-option>
+                <el-option label="政企线条" value="否"></el-option>
+              </el-select>
             </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-col>
+          <el-col :span="6">
+
+            <el-form-item label="宽带配置选项:" prop="isSevenProject">
+              <el-select v-model="form.broadband" placeholder="请选择">
+                <el-option label="是" value="是"></el-option>
+                <el-option label="无" value="否"></el-option>
+              </el-select>
             </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-col>
+          <el-col :span="6">
+            <el-form-item label="资费价格:" prop="proposer">
+              <el-input v-model="form.tariffPrice"></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <!-- 新资费配置显示表单 -->
+          <div v-if="newPostAge">
+            <el-row>
+              <el-col :span="6">
+
+                <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-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="资费名称:" prop="proposer">
+                  <el-input v-model="form.tariffName"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="资费描述" prop="tariffDesc" label-width="110px">
+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.tariffDesc"></el-input>
+                </el-form-item>
+
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="4">
+                <el-form-item label="费用收取方式:" prop="costPayWay" label-width="150px">
+                  <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-select>
+                </el-form-item>
+
+              </el-col>
+              <el-col :span="20">
+                <el-form-item prop="costPayWayInput">
+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.costPayWayInput"></el-input>
+                </el-form-item>
+
+              </el-col>
+
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+
+                <el-form-item label="办理场景" prop="handleWay" label-width="110px">
+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.handleWay"></el-input>
+                </el-form-item>
+              </el-col>>
+
+            </el-row>
+            <el-row>
+              <el-col :span="10">
+
+                <el-form-item label="提醒短信:" prop="remindMmsg">
+                  <el-checkbox-group v-model="remindMmsg">
+                    <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-col>
+              <el-col :span="14">
+                <el-form-item prop="remindMsgInput" label-width="110px">
+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.remindMsgInput"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="酬金要求:" prop="gratuity">
+                  <el-select v-model="form.gratuity" placeholder="请选择">
+                    <el-option label="无" value="无"></el-option>
+                    <el-option label="有" value="有"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="18">
+                <el-form-item prop="gratuityInput" style="width:100%">
+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.gratuityInput"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="报表要求:" prop="reportForm">
+                  <el-select v-model="form.reportForm" placeholder="请选择">
+                    <el-option label="无" value="无"></el-option>
+                    <el-option label="有" value="有"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="18">
+                <el-form-item prop="reportFormInput">
+                  <el-input type="textarea" maxlength="300" show-word-limit v-model="form.reportFormInput"></el-input>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+            <el-row>
+              <el-form-item label="工单协议条款内容调整" prop="clause" label-width="140px">
+                <el-input type="textarea" maxlength="500" show-word-limit v-model="form.clause"></el-input>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="备注/内容" prop="needBackdrop">
+                <el-input type="textarea" maxlength="500" show-word-limit v-model="form.content"></el-input>
+              </el-form-item>
+            </el-row>
           </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-form-item>
+        </el-row>
+        <el-row>
+
+          <div v-if="postEdit">
+            <el-row>
+              <el-form-item label="内容" prop="count" label-width="110px">
+                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.count"></el-input>
+              </el-form-item>
+            </el-row>
+
+
+            <el-row>
+              <el-form-item label="资费工单协议条款内容调整" prop="clause" label-width="170px">
+                <el-input type="textarea" maxlength="500" show-word-limit v-model="form.clause"></el-input>
+              </el-form-item>
+            </el-row>
           </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>
+        </el-row>
+        <el-row>
+          <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-row>
+
+
       </el-form>
     </div>
     <div></div>
@@ -230,7 +304,14 @@ export default {
       Length: "",
       form: {},
       rules: {},
-      rule: {},
+      rule: {
+        needName: [
+          { required: true, message: "请输入需求名称", trigger: "blur" },
+        ],
+        operationType: [
+          { required: true, message: "请选择操作类型", trigger: "change" },
+        ]
+      },
       copyRule: {},
       isList: [],
       remindMmsg: []
@@ -257,6 +338,7 @@ export default {
   created() {
     this.form = this.list;
     this.copyRule = this.rule;
+    console.log(this.form);
   },
 
   methods: {
@@ -434,6 +516,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-row{
+  margin-top: 16px;
+}
 a {
   text-decoration: none;
 }
@@ -479,7 +564,7 @@ a {
 }
 
 .flex-textarea {
-  width: 72.7%;
+  width: 70.5%;
 }
 
 .el-upload__tip {

src/pages/main/postage/index.vue

@@ -204,11 +204,7 @@ export default {
             prop: "proposer_time",
             width: 250,
           },
-          {
-            label: "上一步处理人",
-            prop: "predealman",
-            width: 200,
-          },
+
           {
             label: "状态",
             prop: "taskName",
@@ -594,14 +590,14 @@ export default {
         // this.fromList = concat;
       });
     },
-    setUpdateCopy(e){
+    setUpdateCopy(e) {
       this.$http({
         url: "/market/zfpzProcess/update",
         method: "post",
         headers: {
           "Content-Type": "application/json",
         },
-        data:e
+        data: e
       }).then((res) => {
         console.log(res);
         this.$message.success(res.data.desc)
@@ -623,8 +619,9 @@ export default {
 
       this.$refs.formTable.$refs.form.validate((valid) => {
         if (valid) {
+          console.log(this.fromList);
           if (this.fromList.id) {
-            this.setUpdate(this.$refs.formTable.form);
+            this.setUpdateCopy(this.$refs.formTable.form)
           } else {
             this.getUserIds();
             this.setForm();
@@ -637,18 +634,18 @@ export default {
     },
     //点击新建
     async clickNewTag() {
-      console.log(123);
+
       this.dialogStatus = true;
-      console.log(this.dialogStatus);
       this.lables.data = [];
       this.disabled = false;
       this.saveStatus = true;
       this.startStatus = true;
+      console.log();
+      this.fromList = {}
       await this.getDepartmentName();
     },
     //处理按钮,开始工作流接口
     clickHandles() {
-      console.log(123);
       this.getNextPath(this.fromList.resourceId || "");
     },
     //查询form表单数据
@@ -663,9 +660,9 @@ export default {
       }).then((res) => {
         // this.dialogStatus = true;
         this.fromList = res.data
-       this.fromList.resourceId = e.resourceId
-       this.fromList.taskId = e.taskId
-       this.fromList.createId = e.createId
+        this.fromList.resourceId = e.resourceId
+        this.fromList.taskId = e.taskId
+        this.fromList.createId = e.createId
         this.fromList.mkFileShareAttachList = res.data.mkFileShareAttachList;
         this.dialogStatus = true;
       });

vue.config.js

@@ -133,10 +133,10 @@ module.exports = {
                 // target: 'http://192.168.1.9:9600/spfm',
                 // target: 'http://127.0.0.1:9600/',
                 // target: 'http://192.168.0.156:9600/',
-                target: 'http://192.168.2.92:9600/',
+                // target: 'http://192.168.2.92:9600/',
                 // target: 'http://192.168.2.124:9600/',
                 // target: "http://124.223.66.248:9600",
-                // target: "http://43.138.50.94:9600",
+                target: "http://43.138.50.94:9600",
                 changeOrigin: true,
             },
         },