Merge branch 'hjw-222' into 'master'

宣传物料新增信息

See merge request spfm/spfm-market-front!488

src/config/dev.js

@@ -43,8 +43,8 @@ let dev = {
     provincialWorkOrderAreafresourceId: 'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
     provincialWorkOrderfresourceId: '08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
     riskMaterialsfresourceId: 'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
-    materialApplicationfresourceId:'6cc2a037-a750-11ed-886f-d6cd97160e00',//宣传物料省
-    materialApplicationdsfresourceId:'241efa62-a816-11ed-886f-d6cd97160e00',//宣传物料地市
+    materialApplicationfresourceId:'b58e5e25-ce13-11ed-afb6-e00084564cce',//宣传物料省
+    materialApplicationdsfresourceId:'cd072057-ce13-11ed-afb6-e00084564ce',//宣传物料地市
     accountApplicationfresourceId: 'b3e6cc47-b1a9-11ed-886f-d6cd97160e00',//账号申请流程
     accountdelfresourceId: '6a5fc7b5-b290-11ed-886f-d6cd97160e00',//账号删除
     accountPermissionsfresourceId: '14c60ff0-b1a8-11ed-886f-d6cd97160e00',//账号权限申请流程

src/pages/main/advertising/materialApplication.vue

@@ -46,6 +46,9 @@
                 <!-- <el-table-column label="结算金额" prop="replyContent"></el-table-column> -->
                 <el-table-column label="麦穗" prop="gys1Price"></el-table-column>
                 <el-table-column label="神笔" prop="gys2Price"></el-table-column>
+
+                <el-table-column label="江苏邮电" prop="gys3Price"></el-table-column>
+                <el-table-column label="湖州绿包" prop="gys4Price"></el-table-column>
                 <el-table-column label="状态" prop="taskname"></el-table-column>
                 <el-table-column label="操作" fixed="right" align="center">
                   <template slot-scope="scope">
@@ -231,6 +234,8 @@
                       </div>
                     </template> -->
                     </el-table-column>
+                    <el-table-column label="江苏邮电" prop="gys3Price"></el-table-column>
+                    <el-table-column label="湖州绿包" prop="gys4Price"></el-table-column>
                     <el-table-column label="操作" fixed="right" align="center"
                       v-if="this.infolist.tabletaskName == '起草' || this.infolist.tabletaskName == '地市宣传负责人'">
                       <template slot-scope="scope">
@@ -538,6 +543,16 @@ export default {
             width: 100,
           },
           {
+            label: "江苏邮电",
+            prop: "gys3Price",
+            width: 100,
+          },
+          {
+            label: "湖州绿包",
+            prop: "gys4Price",
+            width: 100,
+          },
+          {
             label: "状态",
             prop: "taskname",
             width: 200,
@@ -660,6 +675,16 @@ export default {
             width: 100,
           },
           {
+            label: "江苏邮电",
+            prop: "gys3Price",
+            width: 100,
+          },
+          {
+            label: "湖州绿包",
+            prop: "gys4Price",
+            width: 100,
+          },
+          {
             label: "状态",
             prop: "taskname",
             width: 200,
@@ -1109,17 +1134,18 @@ export default {
       //  console.log(this.selectLetter);
     },
     dealwith() {
+      console.log(this.infolist);
       if (this.infolist.tabletaskName == "省公司宣传负责人" || this.infolist.tabletaskName == "区县公司负责人") {
 
         if (this.teshuhuanjie.length == 0) {
           this.$message.error("请先点击保存");
         } else {
           this.dialogVisible1 = true;
-          this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.needName;
+          this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.businessName;
         }
       } else {
         this.dialogVisible1 = true;
-        this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.needName;
+        this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.businessName;
       }
 
     },
@@ -1151,6 +1177,8 @@ export default {
 
         this.infomaterType[0].gys1Price = res.data.body.gys1Price;
         this.infomaterType[0].gys2Price = res.data.body.gys2Price;
+        this.infomaterType[0].gys3Price = res.data.body.gys3Price;
+        this.infomaterType[0].gys4Price = res.data.body.gys4Price;
 
 
       });
@@ -1184,10 +1212,11 @@ export default {
     },
     //任务下发
     getinform(r) {
-
+      console.log(r);
       this.infolist = r;
       this.infolist.id = r.id;
       this.request_form.businessKey = r.id;
+      this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + r.needName;
       this.getUserIds();
 
     },
@@ -1207,7 +1236,7 @@ export default {
 
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
-        this.request_form.title = '[市场工作台]-' + '省宣传物料申请及审批-' + this.infolist.needName;
+
 
         this.clickHandle(this.infolist);
       });
@@ -1451,7 +1480,7 @@ export default {
         tableName: this.requestForm.processDefinitionKey,
         applyType: "省"
       };
-      if (e.taskId) {
+      if (e) {
         list.taskId = e.taskId
       }
       this.$http({
@@ -1463,10 +1492,8 @@ export default {
         },
         data: list,
       }).then((res) => {
-        if (e.taskId) {
-          if (status === 0) {
-            this.clickDemand("业务名称", res.data.data[0]);
-          }
+        if (status === 0) {
+          this.clickDemand("业务名称", res.data.data[0]);
         }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;

src/pages/main/advertising/materialApplicationds.vue

@@ -45,6 +45,8 @@
                 <!-- <el-table-column label="结算金额" prop="replyContent"></el-table-column> -->
                 <el-table-column label="麦穗" prop="gys1Price"></el-table-column>
                 <el-table-column label="神笔" prop="gys2Price"></el-table-column>
+                <el-table-column label="江苏邮电" prop="gys3Price"></el-table-column>
+                <el-table-column label="湖州绿包" prop="gys4Price"></el-table-column>
                 <el-table-column label="状态" prop="taskname"></el-table-column>
                 <el-table-column label="操作" fixed="right" align="center">
                   <template slot-scope="scope">
@@ -230,6 +232,8 @@
                       </div>
                     </template> -->
                     </el-table-column>
+                    <el-table-column label="江苏邮电" prop="gys3Price"></el-table-column>
+                    <el-table-column label="湖州绿包" prop="gys4Price"></el-table-column>
                     <el-table-column label="操作" fixed="right" align="center" v-if="this.infolist.tabletaskName == '起草'">
                       <template slot-scope="scope">
                         <el-button size="mini" type="text" @click="updatexiuform(scope.row)" :disabled="xiugaizhuan">
@@ -542,6 +546,16 @@ export default {
             width: 100,
           },
           {
+            label: "江苏邮电",
+            prop: "gys3Price",
+            width: 100,
+          },
+          {
+            label: "湖州绿包",
+            prop: "gys4Price",
+            width: 100,
+          },
+          {
             label: "状态",
             prop: "taskname",
             width: 200,
@@ -664,6 +678,16 @@ export default {
             width: 100,
           },
           {
+            label: "江苏邮电",
+            prop: "gys3Price",
+            width: 100,
+          },
+          {
+            label: "湖州绿包",
+            prop: "gys4Price",
+            width: 100,
+          },
+          {
             label: "状态",
             prop: "taskname",
             width: 200,
@@ -1081,11 +1105,11 @@ export default {
           this.$message.error("请先点击保存");
         } else {
           this.dialogVisible1 = true;
-          this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.needName;
+          this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.businessName;
         }
       } else {
         this.dialogVisible1 = true;
-        this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.needName;
+        this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.businessName;
       }
 
     },
@@ -1117,6 +1141,8 @@ export default {
 
         this.infomaterType[0].gys1Price = res.data.body.gys1Price;
         this.infomaterType[0].gys2Price = res.data.body.gys2Price;
+        this.infomaterType[0].gys3Price = res.data.body.gys3Price;
+        this.infomaterType[0].gys4Price = res.data.body.gys4Price;
 
 
       });
@@ -1154,6 +1180,7 @@ export default {
       this.infolist = r;
       this.infolist.id = r.id;
       this.request_form.businessKey = r.id;
+      this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + r.needName;
       this.getUserIds();
 
     },
@@ -1174,7 +1201,7 @@ export default {
         // console.log(res.data[0].children);
         this.request_form.userName = res.data[0].children[0].loginNameStr;
         this.request_form.userId = res.data[0].children[0].loginNoStr;
-        this.request_form.title = '[市场工作台]-' + '地市宣传物料申请及审批-' + this.infolist.needName;
+
 
         this.clickHandle(this.infolist);
       });
@@ -1417,7 +1444,7 @@ export default {
         tableName: this.requestForm.processDefinitionKey1,
         applyType: "地市"
       };
-      if (e.taskId) {
+      if (e) {
         list.taskId = e.taskId
       }
       this.$http({
@@ -1429,10 +1456,8 @@ export default {
         },
         data: list,
       }).then((res) => {
-        if (e.taskId) {
-          if (status === 0) {
-            this.clickDemand("业务名称", res.data.data[0]);
-          }
+        if (status === 0) {
+          this.clickDemand("业务名称", res.data.data[0]);
         }
         this.firstTable.data = res.data.data;
         this.firstTable.pageData.total = res.data.totalRecord;

src/pages/main/internetAssessment/internetAssessment.vue

@@ -109,7 +109,7 @@
                             <el-table-column prop="score" label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || fromList.taskName == '发起考核'">
                                         <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
                                             oninput="value=value.replace(/[^\d.]/g,'')"
                                             @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
@@ -191,7 +191,7 @@
                             <el-table-column prop="score" label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || fromList.taskName == '发起考核'">
                                         <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
                                             @input="numDxsCheck(fromList.content1.tableData1[scope.$index], 1, 'score')"
                                             @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
@@ -273,7 +273,7 @@
                             <el-table-column prop="score" label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || fromList.taskName == '发起考核'">
                                         <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
                                             @input="numDxsCheck(fromList.content1.tableData2[scope.$index], 1, 'score')"
                                             @blur="onInputFocus2(scope.$index, scope.row.score)"></el-input>
@@ -307,7 +307,7 @@
                             <el-table-column label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || fromList.taskName == '发起考核'">
                                         <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
                                             @input="numDxsCheck(fromList.content1.tableData3[scope.$index], 1, 'score')"
                                             @blur="onInputFocus3(scope.$index, scope.row.score)"></el-input>
@@ -329,7 +329,7 @@
                             <el-table-column label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || fromList.taskName == '发起考核'">
                                         <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
                                             @input="numDxsCheck(fromList.content1.tableData4[scope.$index], 1, 'score')"
                                             @blur="onInputFocus4(scope.$index, scope.row.score)"></el-input>
@@ -351,7 +351,7 @@
                             <el-table-column label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || fromList.taskName == '发起考核'">
                                         <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
                                             @input="numDxsCheck(fromList.content1.tableData5[scope.$index], 1, 'score')"
                                             @blur="onInputFocus5(scope.$index, scope.row.score)"></el-input>