Merge branch 'zj' into dev

src/components/shop-car-apply/apply_form.vue

@@ -13,7 +13,7 @@
         <el-input
           disabled
           v-model="formInline.depart"
-          placeholder="审批人"
+          placeholder="申请部门"
         ></el-input>
       </el-form-item>
       <el-form-item prop="preson">

src/components/table/table-input.vue

@@ -58,7 +58,7 @@ import helper from "@/services/helper";
 export default {
   props: {
     item: {
-      type: String,
+      type: [String,Number],
       default: ""
     },
     header: {

src/pages/workbench/fwgl/serviceDetail.vue

@@ -330,130 +330,14 @@ export default {
           label: "访问次数（次/日）",
           minWidth: "33.33%",
           align: "center",
-          type: "select",
-          selectArr: [
-            {
-              label: "10",
-              value: 10,
-            },
-            {
-              label: "20",
-              value: 20,
-            },
-            {
-              label: "30",
-              value: 30,
-            },
-            {
-              label: "40",
-              value: 40,
-            },
-            {
-              label: "50",
-              value: 50,
-            },
-            {
-              label: "60",
-              value: 60,
-            },
-            {
-              label: "70",
-              value: 70,
-            },
-            {
-              label: "80",
-              value: 80,
-            },
-            {
-              label: "90",
-              value: 90,
-            },
-            {
-              label: "100",
-              value: 100,
-            },
-            {
-              label: "200",
-              value: 200,
-            },
-            {
-              label: "300",
-              value: 300,
-            },
-            {
-              label: "400",
-              value: 400,
-            },
-            {
-              label: "500",
-              value: 500,
-            },
-          ],
+          type: "input",
         },
         {
           prop: "pv",
           label: "访问量（PV/日）",
           minWidth: "33.33%",
           align: "center",
-          type: "select",
-          selectArr: [
-            {
-              label: "100",
-              value: 100,
-            },
-            {
-              label: "200",
-              value: 200,
-            },
-            {
-              label: "300",
-              value: 300,
-            },
-            {
-              label: "400",
-              value: 400,
-            },
-            {
-              label: "500",
-              value: 500,
-            },
-            {
-              label: "600",
-              value: 600,
-            },
-            {
-              label: "700",
-              value: 700,
-            },
-            {
-              label: "800",
-              value: 800,
-            },
-            {
-              label: "900",
-              value: 900,
-            },
-            {
-              label: "1000",
-              value: 1000,
-            },
-            {
-              label: "2000",
-              value: 2000,
-            },
-            {
-              label: "3000",
-              value: 3000,
-            },
-            {
-              label: "4000",
-              value: 4000,
-            },
-            {
-              label: "5000",
-              value: 5000,
-            },
-          ],
+          type: "input",
         },
         {
           prop: "des",