Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/ProductionOrderList/Deliverylist/Deliverylist.vue

@@ -169,14 +169,14 @@ export default {
           key: "transport_no",
           minWidth: 200,
         },
-        {
-          title: "订单类型",
-          align: "center",
-          key: "type",
-          minWidth: 100,
-          render: (h, params) =>
-            h("span", {}, params.row.type == 1 ? "工装" : "家装"),
-        },
+        // {
+        //   title: "订单类型",
+        //   align: "center",
+        //   key: "type",
+        //   minWidth: 100,
+        //   render: (h, params) =>
+        //     h("span", {}, params.row.type == 1 ? "工装" : "家装"),
+        // },
         {
           title: "紧急程度",
           align: "center",
@@ -204,14 +204,14 @@ export default {
           key: "in_out_value",
           minWidth: 150,
         },
-        { title: "客户", align: "center", key: "client_name", minWidth: 150 },
+        // { title: "客户", align: "center", key: "client_name", minWidth: 150 },
         {
           title: "运输百分比",
           align: "center",
           key: "transportation_value",
           minWidth: 150,
         },
-        { title: "手机号", align: "center", key: "mobile", minWidth: 150 },
+        // { title: "手机号", align: "center", key: "mobile", minWidth: 150 },
         {
           title: "订单状态",
           align: "center",
@@ -295,17 +295,17 @@ export default {
           placeholder: "请输入订单编号",
           value: "",
         },
-        {
-          title: "订单类型",
-          name: "Select",
-          placeholder: "请选择",
-          serverName: "type",
-          value: "",
-          option: [
-            { label: "工装", value: 1 },
-            { label: "家装", value: 0 },
-          ],
-        },
+        // {
+        //   title: "订单类型",
+        //   name: "Select",
+        //   placeholder: "请选择",
+        //   serverName: "type",
+        //   value: "",
+        //   option: [
+        //     { label: "工装", value: 1 },
+        //     { label: "家装", value: 0 },
+        //   ],
+        // },
         {
           title: "订单状态",
           name: "Select",
@@ -335,20 +335,20 @@ export default {
           placeholder: "项目名称",
           value: "",
         },
-        {
-          title: "客户",
-          name: "Input",
-          serverName: "client_name",
-          placeholder: "客户",
-          value: "",
-        },
-        {
-          title: "手机号",
-          name: "Input",
-          serverName: "mobile",
-          placeholder: "手机号",
-          value: "",
-        },
+        // {
+        //   title: "客户",
+        //   name: "Input",
+        //   serverName: "client_name",
+        //   placeholder: "客户",
+        //   value: "",
+        // },
+        // {
+        //   title: "手机号",
+        //   name: "Input",
+        //   serverName: "mobile",
+        //   placeholder: "手机号",
+        //   value: "",
+        // },
         {
           title: "出库日期范围",
           start_server: "start_time",

src/views/ProductionOrderList/Dispatchlist/list.vue

@@ -69,14 +69,15 @@ export default {
   data () {
     return {
       tableColums: [
-        { title: '订单编号', align: 'center', key: 'order_no', fixed: 'left', width: '200' },
-        {
-          title: '订单类型', align: 'center', key: 'renovation_type', minWidth: 150,
-          render: (h, params) => h('span', {}, params.row.renovation_type == 1 ? '工装' : '家装')
-        },
+        { title: '项目编号', align: 'center', key: 'order_no', fixed: 'left', width: '200' },
+        // {
+        //   title: '订单类型', align: 'center', key: 'renovation_type', minWidth: 150,
+        //   render: (h, params) => h('span', {}, params.row.renovation_type == 1 ? '工装' : '家装')
+        // },
 
-        { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
+        
         { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
+        { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
         {
           title: '派工开始时间', align: 'center', key: 'start_time', minWidth: 200,
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.start_time * 1, 1))
@@ -85,7 +86,7 @@ export default {
           title: '派工结束时间', align: 'center', key: 'end_time', minWidth: 200,
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.end_time * 1, 1))
         },
-        { title: '派工人员', align: 'center', key: 'nickname', minWidth: 200 },
+        // { title: '派工人员', align: 'center', key: 'nickname', minWidth: 200 },
         {
           title: '预估工期', align: 'center', key: 'predict_time', minWidth: 200,
           render: (h, params) => h('span', `${(params.row.predict_time / 8).toFixed(1)}天`)
@@ -115,7 +116,7 @@ export default {
     },
     set_list () {
       return [
-        { title: '订单编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
+        { title: '项目编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
         {
           title: '派工状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
           option: [
@@ -125,19 +126,19 @@ export default {
           ]
         },
         { title: '开始派工时间', name: 'Input', start_server: 'start_time', end_server: 'end_time', start_value: '', end_value: '', isDate: true, serverName: 'id2', start_placeholder: '开始日期', end_placeholder: '结束日期' },
-        {
-          title: '订单类型', name: 'Select', serverName: 'renovation_type', placeholder: '请选择订单类型', value: '',
-          option: [
-            { label: '工装', value: 1 },
-            { label: '家装', value: 0 },
-          ]
-        },
+        // {
+        //   title: '订单类型', name: 'Select', serverName: 'renovation_type', placeholder: '请选择订单类型', value: '',
+        //   option: [
+        //     { label: '工装', value: 1 },
+        //     { label: '家装', value: 0 },
+        //   ]
+        // },
         { title: '紧急程度', name: 'Select', serverName: 'warning_state', placeholder: '请选择', value: '', optionName: 'title', optionValue: 'id', option: this.warningList },
         { title: '项目名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入项目名称', value: '' },
-        {
-          title: '派工人员', name: 'Select', serverName: 'user_id', placeholder: '请选择派工人员', optionName: 'nickname', optionValue: 'id', value: '',
-          option: this.userList
-        },
+        // {
+        //   title: '派工人员', name: 'Select', serverName: 'user_id', placeholder: '请选择派工人员', optionName: 'nickname', optionValue: 'id', value: '',
+        //   option: this.userList
+        // },
       ]
     }
   },

src/views/ProductionOrderList/InboundForm/index.vue

@@ -60,21 +60,21 @@ export default {
           render: (h, params) => h("span", {}, params.index + 1),
         },
         { title: "订单编号", align: "center", key: "order_no", minWidth: 200 },
-        {
-          title: "订单类型",
-          align: "center",
-          key: "type",
-          minWidth: 100,
-          render: (h, params) =>
-            h("span", {}, params.row.type == 1 ? "工装" : "家装"),
-        },
+        // {
+        //   title: "订单类型",
+        //   align: "center",
+        //   key: "type",
+        //   minWidth: 100,
+        //   render: (h, params) =>
+        //     h("span", {}, params.row.type == 1 ? "工装" : "家装"),
+        // },
         {
           title: "项目名称",
           align: "center",
           key: "residential_name",
           minWidth: 200,
         },
-        { title: "手机号", align: "center", key: "mobile", minWidth: 200 },
+        // { title: "手机号", align: "center", key: "mobile", minWidth: 200 },
         {
           title: "紧急程度",
           align: "center",
@@ -83,7 +83,7 @@ export default {
           slot: "basicTypeSet",
         },
         {
-          title: "生产进度",
+          title: "包装进度",
           align: "center",
           key: "complete_rate",
           minWidth: 180,
@@ -197,17 +197,17 @@ export default {
             { label: "包装完成", value: 3 },
           ],
         },
-        {
-          title: "订单类型",
-          name: "Select",
-          placeholder: "请选择",
-          serverName: "type",
-          value: "",
-          option: [
-            { label: "工装", value: 1 },
-            { label: "家装", value: 0 },
-          ],
-        },
+        // {
+        //   title: "订单类型",
+        //   name: "Select",
+        //   placeholder: "请选择",
+        //   serverName: "type",
+        //   value: "",
+        //   option: [
+        //     { label: "工装", value: 1 },
+        //     { label: "家装", value: 0 },
+        //   ],
+        // },
         {
           title: "日期范围",
           name: "Input",
@@ -226,13 +226,13 @@ export default {
           value: "",
           serverName: "client_name",
         },
-        {
-          title: "手机号",
-          name: "Input",
-          placeholder: "请输入手机号",
-          value: "",
-          serverName: "mobile",
-        },
+        // {
+        //   title: "手机号",
+        //   name: "Input",
+        //   placeholder: "请输入手机号",
+        //   value: "",
+        //   serverName: "mobile",
+        // },
         {
           title: "包装员",
           name: "Select",

src/views/ProductionOrderList/ProductionPlanlist/BST_two.vue

@@ -364,17 +364,23 @@ export default {
           width: "90",
           align: "center",
         },
-        { title: "订单编号", align: "center", key: "order_no", minWidth: 200 },
-        { title: "计划单号", align: "center", key: "plan_no", minWidth: 200 },
+        { title: "项目编号", align: "center", key: "order_no", minWidth: 200 },
         {
-          title: "订单类型",
+          title: "项目名称",
           align: "center",
-          key: "order_type",
-          minWidth: 150,
-          render(h, params) {
-            return h("span", {}, params.row.order_type == 1 ? "工装" : "家装");
-          },
+          key: "residential_name",
+          minWidth: 200,
         },
+        { title: "计划单号", align: "center", key: "plan_no", minWidth: 200 },
+        // {
+        //   title: "订单类型",
+        //   align: "center",
+        //   key: "order_type",
+        //   minWidth: 150,
+        //   render(h, params) {
+        //     return h("span", {}, params.row.order_type == 1 ? "工装" : "家装");
+        //   },
+        // },
         {
           title: "订单状态",
           align: "center",
@@ -402,12 +408,6 @@ export default {
           slot: "basicTypeSet",
         },
         {
-          title: "项目名称",
-          align: "center",
-          key: "residential_name",
-          minWidth: 200,
-        },
-        {
           title: "计划开始时间",
           align: "center",
           minWidth: 200,
@@ -509,10 +509,10 @@ export default {
     set_list() {
       return [
         {
-          title: "订单编号",
+          title: "项目编号",
           name: "Input",
           serverName: "order_no",
-          placeholder: "请输入订单编号",
+          placeholder: "请输入项目编号",
           value: "",
         },
         {
@@ -522,17 +522,17 @@ export default {
           placeholder: "请选择项目名称",
           value: "",
         },
-        {
-          title: "订单类型",
-          name: "Select",
-          placeholder: "请选择",
-          serverName: "order_type",
-          value: "",
-          option: [
-            { label: "工装", value: 1 },
-            { label: "家装", value: 0 },
-          ],
-        },
+        // {
+        //   title: "订单类型",
+        //   name: "Select",
+        //   placeholder: "请选择",
+        //   serverName: "order_type",
+        //   value: "",
+        //   option: [
+        //     { label: "工装", value: 1 },
+        //     { label: "家装", value: 0 },
+        //   ],
+        // },
         {
           title: "计划单号",
           name: "Input",

src/views/ProductionOrderList/ProductionsOrder/BST_list.vue

@@ -78,17 +78,18 @@ export default {
     return {
       tableColums: [
         { type: 'selection', key: 'selection', title: '全选', fixed: 'left', width: 90, align: 'center' },
-        { title: '订单编号', align: 'center', key: 'order_no', width: '200' },
-        {
-          title: '订单类型', align: 'center', key: 'order_type', width: '200',
-          render: (h, params) => {
-            return h('span', {}, params.row.order_type == 1 ? '工装' : '家装')
-          }
-        },
+        { title: '项目编号', align: 'center', key: 'order_no', width: '200' },
+        // {
+        //   title: '订单类型', align: 'center', key: 'order_type', width: '200',
+        //   render: (h, params) => {
+        //     return h('span', {}, params.row.order_type == 1 ? '工装' : '家装')
+        //   }
+        // },
         // {
         //   title: '生产订单编号', align: 'center', key: 'oa_order_no', minWidth: 200,
         //   render: (h, params) => h('span', {}, params.row.oa_order_no || params.row.order_no)
         // },
+         { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         {
           title: '生产状态', align: 'center', key: 'state', minWidth: 150,
           render: (h, params) => h('span', {},
@@ -97,10 +98,10 @@ export default {
                 : (params.row.state >= 2 ? '计划完成' : '全部'))
           )
         },
-        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
-        { title: '地址', align: 'center', key: 'address', minWidth: 200 },
-        { title: '客户姓名', align: 'center', key: 'client_name', minWidth: 200 },
-        { title: '手机号', align: 'center', key: 'mobile', minWidth: 200 },
+       
+        // { title: '地址', align: 'center', key: 'address', minWidth: 200 },
+        // { title: '客户姓名', align: 'center', key: 'client_name', minWidth: 200 },
+        // { title: '手机号', align: 'center', key: 'mobile', minWidth: 200 },
         // { title: '测量人员', align: 'center', key: 'nickname', minWidth: 200 },
         { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
         {
@@ -175,21 +176,21 @@ export default {
     },
     set_list () {
       return [
-        { title: '订单编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
+        { title: '项目编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
         { title: '项目名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入项目名称', value: '' },
-        {
-          title: '订单类型', name: 'Select', serverName: 'order_type', placeholder: '请选择', value: '',
-          option: [
-            { label: '工装', value: 1 },
-            { label: '家装', value: 0 }
-          ]
-        },
-        {
-          title: '测量人员', name: 'Select', serverName: 'type', optionName: 'nickname', optionValue: 'id', placeholder: '请选择', value: '',
-          option: this.userList
-        },
-        { title: '客户名字', name: 'Input', serverName: 'client_name', placeholder: '请输入', value: '' },
-        { title: '手机号', name: 'Input', serverName: 'mobile', placeholder: '请输入', value: '' },
+        // {
+        //   title: '订单类型', name: 'Select', serverName: 'order_type', placeholder: '请选择', value: '',
+        //   option: [
+        //     { label: '工装', value: 1 },
+        //     { label: '家装', value: 0 }
+        //   ]
+        // },
+        // {
+        //   title: '测量人员', name: 'Select', serverName: 'type', optionName: 'nickname', optionValue: 'id', placeholder: '请选择', value: '',
+        //   option: this.userList
+        // },
+        // { title: '客户名字', name: 'Input', serverName: 'client_name', placeholder: '请输入', value: '' },
+        // { title: '手机号', name: 'Input', serverName: 'mobile', placeholder: '请输入', value: '' },
         { title: '紧急程度', name: 'Select', serverName: 'warning_state', placeholder: '请选择', value: '', optionName: 'title', optionValue: 'id', option: this.warningList },
         {
           title: '生产状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',

src/views/ProductionOrderList/workOver/list.vue

@@ -68,14 +68,15 @@ export default {
   data () {
     return {
       tableColums: [
-        { title: '订单编号', align: 'center', key: 'order_no', fixed: 'left', width: '200' },
-        {
-          title: '订单类型', align: 'center', key: 'renovation_type', minWidth: 150,
-          render: (h, params) => h('span', {}, params.row.renovation_type == 1 ? '工装' : '家装')
-        },
+        { title: '项目编号', align: 'center', key: 'order_no', fixed: 'left', width: '200' },
+        // {
+        //   title: '订单类型', align: 'center', key: 'renovation_type', minWidth: 150,
+        //   render: (h, params) => h('span', {}, params.row.renovation_type == 1 ? '工装' : '家装')
+        // },
 
+        
+        { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 200 },
         { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
-        { title: '小区', align: 'center', key: 'residential_name', minWidth: 200 },
         {
           title: '派工开始时间', align: 'center', key: 'start_time', minWidth: 200,
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.start_time * 1, 1))
@@ -114,25 +115,25 @@ export default {
     },
     set_list () {
       return [
-        { title: '订单编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
-        {
-          title: '订单状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
-          option: [
-            { label: '未生产', value: 0 },
-            { label: '生产中', value: 1 },
-            { label: '生产完成', value: 2 },
-          ]
-        },
+        { title: '项目编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
+        // {
+        //   title: '订单状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
+        //   option: [
+        //     { label: '未生产', value: 0 },
+        //     { label: '生产中', value: 1 },
+        //     { label: '生产完成', value: 2 },
+        //   ]
+        // },
         { title: '派工开始时间', name: 'Input', start_server: 'start_time', end_server: 'end_time', start_value: '', end_value: '', isDate: true, serverName: 'id2', start_placeholder: '开始日期', end_placeholder: '结束日期' },
-        {
-          title: '订单类型', name: 'Select', serverName: 'renovation_type', placeholder: '请选择订单类型', value: '',
-          option: [
-            { label: '工装', value: 1 },
-            { label: '家装', value: 0 },
-          ]
-        },
+        // {
+        //   title: '订单类型', name: 'Select', serverName: 'renovation_type', placeholder: '请选择订单类型', value: '',
+        //   option: [
+        //     { label: '工装', value: 1 },
+        //     { label: '家装', value: 0 },
+        //   ]
+        // },
         { title: '紧急程度', name: 'Select', serverName: 'warning_state', placeholder: '请选择', value: '', optionName: 'title', optionValue: 'id', option: this.warningList },
-        { title: '小区名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入项目名称', value: '' },
+        { title: '项目名称', name: 'Input', serverName: 'residential_name', placeholder: '请输入项目名称', value: '' },
         {
           title: '派工人员', name: 'Select', serverName: 'user_id', placeholder: '请选择派工人员', optionName: 'nickname', optionValue: 'id', value: '',
           option: this.userList

vue.config.js

@@ -1,8 +1,8 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://121.37.173.82:82"
+    ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://121.37.173.82:82" //测试服
+    ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:82";