按需进行修改

Signed-off-by: 熊铠 <xiongkai@dragoninfo.com.cn>

package.json

@@ -23,14 +23,14 @@
         "registry": "http://192.168.6.13:8082/repository/npm_ui"
     },
     "dependencies": {
-        "axios": "^0.18.0",
-        "babel-polyfill": "^6.26.0",
-        "dayjs": "^1.9.7",
-        "echarts": "^4.2.0-rc.2",
-        "gojs": "^2.0.15",
-        "html": "^1.0.0",
-        "ip": "^1.1.5",
-        "jquery": "^3.4.1",
+      "axios": "^0.18.0",
+      "babel-polyfill": "^6.26.0",
+      "dayjs": "^1.9.7",
+      "echarts": "^4.2.0-rc.2",
+      "gojs": "^2.0.15",
+      "html": "^1.0.0",
+      "ip": "^1.1.5",
+      "jquery": "^3.4.1",
       "jquery.nicescroll": "^3.7.6",
       "js-cookie": "^2.2.0",
       "lodash": "^4.17.11",
@@ -65,26 +65,27 @@
         "babel-plugin-dynamic-import-node": "^2.0.0",
         "babel-plugin-syntax-jsx": "^6.18.0",
         "babel-plugin-transform-runtime": "^6.23.0",
-        "babel-plugin-transform-vue-jsx": "^3.7.0",
-        "babel-preset-env": "^1.7.0",
-        "babel-preset-stage-2": "^6.24.1",
-        "chalk": "^2.4.1",
-        "clean-webpack-plugin": "^2.0.1",
-        "compression-webpack-plugin": "^2.0.0",
-        "connect": "^3.6.6",
-        "copy-webpack-plugin": "^4.5.2",
-        "cross-env": "^5.2.0",
-        "css-loader": "1.0.0",
-        "eslint": "^5.14.0",
-        "eslint-config-prettier": "^4.0.0",
-        "eslint-config-standard": "^12.0.0",
-        "eslint-plugin-html": "^5.0.0",
-        "eslint-plugin-import": "^2.16.0",
-        "eslint-plugin-node": "^8.0.1",
-        "eslint-plugin-prettier": "^3.0.1",
-        "eslint-plugin-promise": "^4.0.1",
-        "eslint-plugin-standard": "^4.0.0",
-        "eslint-plugin-vue": "^5.2.1",
+      "babel-plugin-transform-vue-jsx": "^3.7.0",
+      "babel-preset-env": "^1.7.0",
+      "babel-preset-stage-2": "^6.24.1",
+      "chalk": "^2.4.1",
+      "clean-webpack-plugin": "^2.0.1",
+      "compression-webpack-plugin": "^2.0.0",
+      "connect": "^3.6.6",
+      "copy-webpack-plugin": "^4.5.2",
+      "cross-env": "^5.2.0",
+      "css-loader": "1.0.0",
+      "element-ui": "^2.15.1",
+      "eslint": "^5.14.0",
+      "eslint-config-prettier": "^4.0.0",
+      "eslint-config-standard": "^12.0.0",
+      "eslint-plugin-html": "^5.0.0",
+      "eslint-plugin-import": "^2.16.0",
+      "eslint-plugin-node": "^8.0.1",
+      "eslint-plugin-prettier": "^3.0.1",
+      "eslint-plugin-promise": "^4.0.1",
+      "eslint-plugin-standard": "^4.0.0",
+      "eslint-plugin-vue": "^5.2.1",
         "extract-text-webpack-plugin": "^4.0.0-beta.0",
         "file-loader": "1.1.11",
         "friendly-errors-webpack-plugin": "1.7.0",

src/pages/service-delegate/detail.vue

@@ -13,22 +13,19 @@
             <el-form-item label="应用名称" prop="appName">
               <div class="u-detail__text">{{ formData.appName }}</div>
             </el-form-item>
-            <el-form-item label="工单编号" prop="orderNo">
-              <div class="u-detail__text">{{ formData.orderNo }}</div>
+            <el-form-item label="应用代码" prop="appCode">
+              <div class="u-detail__text">{{ formData.appCode }}</div>
             </el-form-item>
-            <el-form-item label="服务名称" prop="serviceNames">
-              <div class="u-detail__text">{{ formData.serviceNames }}</div>
+            <el-form-item label="服务名称" prop="serviceName">
+              <div class="u-detail__text">{{ formData.serviceName }}</div>
             </el-form-item>
-            <el-form-item label="申请人" prop="applicantName">
-              <div class="u-detail__text">{{ formData.applicantName }}</div>
-            </el-form-item>
-            <el-form-item label="申请单位" prop="approvalOrgName">
-              <div class="u-detail__text">{{ formData.approvalOrgName }}</div>
+            <el-form-item label="服务代码" prop="serviceCode">
+              <div class="u-detail__text">{{ formData.serviceCode }}</div>
             </el-form-item>
           </dg-col>
           <dg-col :span="14">
-            <el-form-item label="申请时间" prop="applyDate">
-              <div class="u-detail__text">{{ formData.applyDate }}</div>
+            <el-form-item label="创建时间" prop="createTime">
+              <div class="u-detail__text">{{ formData.createTime }}</div>
             </el-form-item>
           </dg-col>
         </dg-row>
@@ -53,7 +50,7 @@ export default {
     }
   },
   created() {
-    this.formData.applyDate = moment(this.formData.applyDate).format("YYYY-MM-DD HH:mm:DD")
+    this.formData.createTime = moment(this.formData.createTime).format("YYYY-MM-DD HH:mm:DD")
   },
   methods: {
     handleClose() {

src/pages/service-delegate/editor.vue

@@ -12,55 +12,40 @@
       <dg-row>
         <dg-col>
           <el-form-item label="应用名称" prop="appName">
-            <el-input
+            <dg-select
                 clearable
-                maxlength="50"
-                placeholder="请输入应用名称"
+                filterable
+                placeholder="请选择应用名称"
                 v-model.trim="sizeForm.appName"
             />
           </el-form-item>
-          <el-form-item label="工单编号" prop="orderNo">
-            <el-input
-                clearable
-                maxlength="50"
-                placeholder="请输入工单编号"
-                v-model.trim="sizeForm.orderNo"
-            />
-          </el-form-item>
-          <el-form-item label="服务名称" prop="serviceNames">
+          <el-form-item label="应用代码" prop="appCode">
             <el-input
                 clearable
+                disabled
                 maxlength="50"
-                placeholder="请输入服务名称"
-                v-model.trim="sizeForm.serviceNames"
+                placeholder=""
+                v-model.trim="sizeForm.appCode"
             />
           </el-form-item>
-          <el-form-item label="申请人" prop="applicantName">
-            <el-input
+          <el-form-item label="服务名称" prop="serviceName">
+            <dg-select
                 clearable
-                maxlength="20"
-                placeholder="请输入申请人姓名"
-                v-model.trim="sizeForm.applicantName"
+                filterable
+                placeholder="请选择服务名称"
+                v-model.trim="sizeForm.serviceName"
             />
           </el-form-item>
-          <el-form-item label="申请单位" prop="approvalOrgName">
+          <el-form-item label="服务代码" prop="serviceCode">
             <el-input
                 clearable
+                disabled
                 maxlength="50"
-                placeholder="请输入申请单位"
-                v-model.trim="sizeForm.approvalOrgName"
+                placeholder=""
+                v-model.trim="sizeForm.serviceCode"
             />
           </el-form-item>
         </dg-col>
-        <dg-col :span="14">
-          <el-form-item label="申请时间" prop="applyDate">
-            <dg-date-picker
-                placeholder="请选择日期"
-                type="datetime"
-                v-model="sizeForm.applyDate">
-            </dg-date-picker>
-          </el-form-item>
-        </dg-col>
       </dg-row>
     </el-form>
     <div class="dg-layer-demo" v-footer>
@@ -86,18 +71,14 @@ export default {
     const that = this
     return {
       sizeForm: {
-        applicantName: "", // *申请人
-        approvalOrgName: "", // *申请单位
-        orderNo: "", // *工单编号
+        appCode: "", // *应用代码
         appName: "", // *应用名称
-        serviceNames: "", // *服务名称
-        applyDate: new Date().toJSON() // *申请日期
+        serviceCode: "", // *服务代码
+        serviceName: "", // *服务名称
       },
       rules: {
-        applicantName: [{required: true, message: "请输入申请人姓名", trigger: "blur"}],
-        approvalOrgName: [{required: true, message: "请输入申请单位", trigger: "blur"}],
         appName: [{required: true, message: "请输入应用名称", trigger: "blur"}],
-        serviceNames: [{required: true, message: "请输入服务名称", trigger: "blur"}],
+        serviceName: [{required: true, message: "请输入服务名称", trigger: "blur"}],
       }
     }
   },
@@ -114,7 +95,7 @@ export default {
     handleSave() {
       const that = this;
       const sizeForm = {...this.sizeForm};
-      //const api = that.type === "create" ? "save" : "update";
+      // const api = that.type === "create" ? "save" : "update";
       this.$refs.ruleForm.validate(valid => {
         if (!valid) {
           return;
@@ -123,7 +104,7 @@ export default {
           that.handleClose(true);
           that.$message.success("保存成功");
         })
-            .catch(error => that.$notify.error({title: "错误", message: error}));
+            .catch(error => that.$message.error({message: error}));
       });
     }
   }

src/pages/service-delegate/index.vue

@@ -9,24 +9,24 @@
     <!--搜索-->
     <el-form :model="reportPersonFrom" label-suffix=":" label-width="90px" ref="reportPersonFrom">
       <dg-row :gutter="20">
-        <dg-col :span="6">
+        <dg-col :span="5">
           <el-form-item label="应用名称" prop="appName.value">
-            <el-input clearable placeholder="" v-model="reportPersonFrom.appName.value"></el-input>
+            <el-input clearable v-model="reportPersonFrom.appName.value"></el-input>
           </el-form-item>
         </dg-col>
-        <!-- <dg-col :span="5">
-            <el-form-item label="服务名称" prop="serviceCodes.value">
-                <dg-select :data="serviceNameList" v-model="reportPersonFrom.serviceCodes.value" multiple></dg-select>
-            </el-form-item>
-        </dg-col> -->
-        <dg-col :span="6">
-          <el-form-item label="申请人" prop="applicantName.value">
-            <el-input clearable v-model="reportPersonFrom.applicantName.value"></el-input>
+        <dg-col :span="5">
+          <el-form-item label="应用代码" prop="appCode.value">
+            <el-input clearable v-model="reportPersonFrom.appCode.value"></el-input>
           </el-form-item>
         </dg-col>
-        <dg-col :span="6">
-          <el-form-item label="申请单位" prop="approvalOrgName.value">
-            <el-input clearable v-model="reportPersonFrom.approvalOrgName.value"></el-input>
+        <dg-col :span="5">
+          <el-form-item label="服务名称" prop="serviceName.value">
+            <el-input clearable v-model="reportPersonFrom.serviceName.value"></el-input>
+          </el-form-item>
+        </dg-col>
+        <dg-col :span="5">
+          <el-form-item label="服务代码" prop="serviceCode.value">
+            <el-input clearable v-model="reportPersonFrom.serviceCode.value"></el-input>
           </el-form-item>
         </dg-col>
         <dg-col :span="4" class="u-search__btn">
@@ -83,14 +83,12 @@ export default {
     return {
       tableUrl: api.tableUrl,
       titleData: [
-        {label: "申请人", prop: "applicantName"},
-        {label: "申请单位", prop: "approvalOrgName"},
-        {label: "工单编号", prop: "orderNo"},
         {label: "应用名称", prop: "appName"},
-        {label: "服务名称", prop: "serviceNames"},
-        {label: "申请时间", prop: "applyTime"}
+        {label: "应用代码", prop: "appCode"},
+        {label: "服务名称", prop: "serviceName"},
+        {label: "服务代码", prop: "serviceCode"},
+        {label: "创建时间", prop: "createTime"}
       ],
-
       optList: [
         {icon: "el-icon-edit", tooltip: "修改", on: that.handleEditor},
         {icon: "el-icon-document", tooltip: "详情", on: that.handleDetail},
@@ -98,19 +96,9 @@ export default {
       ],
       reportPersonFrom: {
         appName: {value: "", op: "like"},
-        serviceNames: {value: "", op: "="},
-        applicantName: {value: "", op: "like"},
-        approvalOrgName: {value: "", op: "like"}
-      },
-      formData: {
-        appName: "NO PUUUUUUUUUUUUUUULLLLS TODAY!",
-        applicantName: "Kamisato Ayaka",
-        applyDate: "2021-03-09T02:29:20.174Z",
-        approvalOrgName: "公安部",
-        orderNo: "1145141919810",
-        serviceNames: "Genshin Impact Version Patch 2.0",
-        id: 1,
-        serviceCodes: "400",
+        serviceName: {value: "", op: "like"},
+        appCode: {value: "", op: "like"},
+        serviceCode: {value: "", op: "like"}
       },
       // 应用下拉数据
       appNameList: [],
@@ -153,8 +141,10 @@ export default {
         title: "添加",
         shade: [0.4, "#FFF"],
         content: Editor,
-        props: {type: "create"},
-        area: ["640px", "480px"],
+        props: {
+          type: "create"
+        },
+        area: ["640px", "380px"],
         on: {
           success(bool = false) {
             layer.close(layer.dialogIndex);
@@ -174,10 +164,10 @@ export default {
               title: "修改",
               shade: [0.4, "#FFF"],
               content: Editor,
-              area: ["640px", "480px"],
+              area: ["640px", "380px"],
               props: {
                 type: "update",
-                formData: that.formData
+                formData: res
               },
               on: {
                 success(bool = false) {
@@ -203,13 +193,15 @@ export default {
               title: "详情",
               shade: [0.4, "#FFF"],
               content: Detail,
-              props: {formData: that.formData},
+              props: {
+                formData: res
+              },
               on: {
                 success() {
                   layer.close(layer.dialogIndex);
                 }
               },
-              area: ["640px", "480px"]
+              area: ["640px", "430px"]
             });
           })
           .catch(error => {