1

src/views/BasicSettings/CustomerFiles/detail.vue

@@ -72,6 +72,7 @@
             v-model="formData.service_id"
             filterable
             clearable
+            transfer
             :disabled="isChecked"
           >
             <Option
@@ -87,6 +88,7 @@
             v-model="formData.overdraft_plan_id"
             filterable
             clearable
+            transfer
             :disabled="isChecked"
           >
             <Option

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -88,7 +88,11 @@
           />
           <span v-else>{{ info.front_money }}</span>
         </FormItem>
-        <FormItem v-if="formObjs.start_time" label="开始日期:">
+        <FormItem
+          v-if="formObjs.start_time"
+          label="开始日期:"
+          prop="start_time"
+        >
           <DatePicker
             :options="options"
             v-if="type != 3"
@@ -99,7 +103,7 @@
           ></DatePicker>
           <span v-else>{{ info.start_time }}</span>
         </FormItem>
-        <FormItem label="客户名称:">
+        <FormItem label="客户名称:" prop="custom_id">
           <Select
             clearable
             filterable
@@ -195,7 +199,7 @@
               : ""
           }}</span>
         </FormItem>
-        <FormItem v-if="formObjs.end_time" label="交付日期:">
+        <FormItem v-if="formObjs.end_time" label="交付日期:" prop="end_time">
           <DatePicker
             :options="options"
             v-if="type != 3"
@@ -206,7 +210,11 @@
           ></DatePicker>
           <span v-else>{{ info.end_time }}</span>
         </FormItem>
-        <FormItem v-if="formObjs.predict_price" label="产品总价:">
+        <FormItem
+          v-if="formObjs.predict_price"
+          label="产品总价:"
+          prop="predict_price"
+        >
           <Input
             v-model="info.predict_price"
             v-if="type != 3"
@@ -216,7 +224,7 @@
           />
           <span v-else>{{ info.predict_price }}</span>
         </FormItem>
-        <FormItem label="折扣金额:">
+        <FormItem label="折扣金额:" prop="fax_price">
           <Input
             v-model="info.fax_price"
             v-if="type != 3"
@@ -226,7 +234,7 @@
           />
           <span v-else>{{ info.fax_price }}</span>
         </FormItem>
-        <FormItem label="订单金额:">
+        <FormItem label="订单金额:" prop="order_price">
           <Input
             v-model="info.order_price"
             v-if="type != 3"
@@ -258,7 +266,7 @@
               : ""
           }}</span>
         </FormItem>
-        <FormItem v-if="formObjs.remark" label="订单备注:">
+        <FormItem v-if="formObjs.remark" label="订单备注:" prop="remark">
           <Input
             v-model="info.remark"
             type="textarea"
@@ -2104,23 +2112,30 @@
       v-model="showForms"
       @on-ok="postForms(1)"
       class-name="vertical-center-modal"
+      style="max-height: 700px; overflow: hidden; overflow-y: auto"
       title="表单设置"
     >
+      <!-- <Table :max-height='600' border :columns="formSetTableColumns" :data="formSetTableData">
+      </Table> -->
       <CheckboxGroup v-model="forms_list">
         <Checkbox label="order_no">订单编号</Checkbox>
         <Checkbox label="residential_name">项目名称</Checkbox>
-        <Checkbox label="client_name">客户名称</Checkbox>
         <Checkbox label="warning_state">紧急程度</Checkbox>
-        <Checkbox label="service_id">业务员</Checkbox>
-        <Checkbox label="pay_state">收款</Checkbox>
-        <Checkbox label="address">客户地址</Checkbox>
-        <Checkbox label="mobile">手机号</Checkbox>
+        <Checkbox label="front_money">项目定金</Checkbox>
         <Checkbox label="start_time">开始日期</Checkbox>
+        <Checkbox label="client_name">客户名称</Checkbox>
+        <Checkbox label="custom_detail_name">负责人</Checkbox>
+        <Checkbox label="custom_detail_mobile">手机号</Checkbox>
+        <Checkbox label="custom_detail_id">详细地址</Checkbox>
+        <Checkbox label="service_id">专营业务员</Checkbox>
         <Checkbox label="end_time">交付日期</Checkbox>
         <Checkbox label="predict_price">产品总价</Checkbox>
-        <Checkbox label="predict_working">预估工期</Checkbox>
-        <Checkbox label="predict_time">预估交付日期</Checkbox>
+        <Checkbox label="order_price">订单金额</Checkbox>
+        <Checkbox label="box_id">包装</Checkbox>
         <Checkbox label="remark">订单备注</Checkbox>
+        <Checkbox label="pay_state">收款</Checkbox>
+        <!-- <Checkbox label="predict_working">预估工期</Checkbox> -->
+        <!-- <Checkbox label="predict_time">预估交付日期</Checkbox> -->
       </CheckboxGroup>
     </Modal>
   </div>
@@ -2185,18 +2200,20 @@ export default {
       formObjs_reset: {
         order_no: 1,
         residential_name: 1,
-        client_name: 1,
         warning_state: 1,
-        service_id: 1,
-        pay_state: 1,
-        address: 1,
-        mobile: 1,
+        front_money: 1,
         start_time: 1,
+        client_name: 1,
+        custom_detail_name: 1,
+        custom_detail_mobile: 1,
+        custom_detail_id: 1,
+        service_id: 1,
         end_time: 1,
         predict_price: 1,
-        predict_working: 1,
-        predict_time: 1,
+        order_price: 1,
+        box_id: 1,
         remark: 1,
+        pay_state: 1,
       },
       tree_btn_show: false,
       showForms: false,
@@ -2232,11 +2249,14 @@ export default {
         residential_name: [{ required: true, message: " ", trigger: "blur" }],
         warning_state: [{ required: true, message: " " }],
         pay_state: [{ required: true, message: "" }],
-        address: [{ required: true, message: " " }],
-        mobile: [{ required: true, validator: validateMobile }],
+        predict_price: [{ required: true, message: " " }],
+        fax_price: [{ required: true, message: " " }],
+        order_price: [{ required: true, message: " " }],
+        custom_id: [{ required: true, message: " " }],
         start_time: [{ required: true, message: " " }],
         end_time: [{ required: true, message: " " }],
         box_id: [{ required: true, message: " " }],
+        remark: [{ required: true, message: " " }],
       },
       info: {
         residential_name: "", //项目名称
@@ -2304,6 +2324,144 @@ export default {
       isAllowLeave: false,
       pre_process_obj: {},
       route_id_at_copy: "",
+      formSetTableColumns: [
+        {
+          title: "是否展示",
+          align: "center",
+          key: "is_show",
+          minWidth: 60,
+          render: (h, params) => {
+            const { index } = params;
+            const currentRow = JSON.parse(
+              JSON.stringify(this.formSetTableData[index])
+            );
+            return h("Checkbox", {
+              props: {
+                value: currentRow.is_show,
+              },
+              on: {
+                "on-change": (e) => {
+                  currentRow.is_show = e;
+                  this.formSetTableData.splice(index, 1, currentRow);
+                },
+              },
+            });
+          },
+        },
+        {
+          title: "字段名",
+          align: "center",
+          key: "value",
+          minWidth: 100,
+        },
+        {
+          title: "展示名称",
+          align: "center",
+          key: "title",
+          minWidth: 100,
+          render: (h, params) => {
+            const { index } = params;
+            const currentRow = JSON.parse(
+              JSON.stringify(this.formSetTableData[index])
+            );
+            return h("Input", {
+              props: {
+                value: currentRow.title,
+                type: "text",
+              },
+              on: {
+                "on-change": (e) => {
+                  currentRow.title = e.target.value;
+                  this.formSetTableData.splice(index, 1, currentRow);
+                },
+              },
+            });
+          },
+        },
+      ],
+      formSetTableData: [
+        {
+          is_show: true,
+          key: "order_no",
+          value: "订单编号",
+          title: "订单编号",
+        },
+        {
+          is_show: true,
+          key: "residential_name",
+          value: "项目名称",
+          title: "项目名称",
+        },
+        {
+          is_show: true,
+          key: "warning_state",
+          value: "紧急程度",
+          title: "紧急程度",
+        },
+        {
+          is_show: true,
+          key: "front_money",
+          value: "项目定金",
+          title: "项目定金",
+        },
+        {
+          is_show: true,
+          key: "start_time",
+          value: "开始日期",
+          title: "开始日期",
+        },
+        {
+          is_show: true,
+          key: "client_name",
+          value: "客户名称",
+          title: "客户名称",
+        },
+        {
+          is_show: true,
+          key: "custom_detail_name",
+          value: "负责人",
+          title: "负责人",
+        },
+        {
+          is_show: true,
+          key: "custom_detail_mobile",
+          value: "手机号",
+          title: "手机号",
+        },
+        {
+          is_show: true,
+          key: "custom_detail_id",
+          value: "详细地址",
+          title: "详细地址",
+        },
+        {
+          is_show: true,
+          key: "service_id",
+          value: "专营业务员",
+          title: "专营业务员",
+        },
+        {
+          is_show: true,
+          key: "end_time",
+          value: "交付日期",
+          title: "交付日期",
+        },
+        {
+          is_show: true,
+          key: "predict_price",
+          value: "产品总价",
+          title: "产品总价",
+        },
+        {
+          is_show: true,
+          key: "order_price",
+          value: "订单金额",
+          title: "订单金额",
+        },
+        { is_show: true, key: "box_id", value: "包装", title: "包装" },
+        { is_show: true, key: "remark", value: "订单备注", title: "订单备注" },
+        { is_show: true, key: "pay_state", value: "收款", title: "收款" },
+      ],
     };
   },
   computed: {
@@ -2385,9 +2543,9 @@ export default {
       let result = [];
       this.forms_list.map((rows) => {
         for (let i in this.formObjs_reset) {
-          if (i == rows) {
-            result.push(i);
-          }
+          // if (i == rows) {
+          result.push(i);
+          // }
         }
       });
       const news_forms = {};
@@ -2976,7 +3134,7 @@ export default {
     },
     handleExtraDele(array, row, index) {
       array.splice(index, 1);
-      this.$forceUpdate()
+      this.$forceUpdate();
     },
     getCoumstList() {
       this.axios("/api/bpp_list").then((res) => {

src/views/ProcessRoute/edit.vue

@@ -285,7 +285,7 @@ export default {
   methods: {
     handleProcessLineSet(row, index) {
       this.info.id = row.id;
-      this.process_name = row.title
+      this.process_name = row.title;
       // this.info.title = row.title;
       this.info.procedure_id = row.procedure_id;
       this.selectTags = [];
@@ -311,11 +311,9 @@ export default {
         params: {
           title,
         },
-      })
-        .then((res) => {
-          this.processLineTableData = res.data.data;
-        })
-        .catch((err) => {});
+      }).then((res) => {
+        this.processLineTableData = res.data.data;
+      });
     },
     back() {
       this.$router.go(-1);
@@ -325,6 +323,7 @@ export default {
       const { type } = this.$route.query;
       this.info.op = type == 1 || type == 4 ? "add" : "edit";
       let data = JSON.parse(JSON.stringify(this.info));
+      data.technological_route_id = data.id;
       type == 4 ? (data.id = "") : "";
       let properties = [],
         procedure = [];
@@ -360,7 +359,6 @@ export default {
           this.info = res.data;
           this.selectTags = res.data.produce_list;
           const selectTagsId = this.selectTags.map((item) => item.id);
-          this.process_name = res.data.process_name
           this.info.bps.forEach((v) => {
             v.cld.forEach((z) => {
               z.show = selectTagsId.includes(z.id);
@@ -381,6 +379,7 @@ export default {
           //         v.cld.map(v=>v.show = false)
           //     }
           // })
+          this.process_name = res.data.technological_route_title
           this.tableData = JSON.parse(JSON.stringify(this.selectTags));
         }
       );