九方优化

src/views/BasicSettings/SuppliersManage/SippliersListEdit.vue

@@ -219,6 +219,7 @@ export default {
               }
             }).then((res) => {
               this.$Message.success(res.msg);
+              this.goBack()
             }).catch((err) => { })
             :
             this.axios({

src/views/ProductionOrderList/Dispatchlist/list.vue

@@ -117,10 +117,11 @@ export default {
       return [
         { title: '订单编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
         {
-          title: '订单状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
+          title: '派工状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
           option: [
-            { label: '派工中', value: 7 },
-            { label: '全部', value: 99 },
+            { label: '未生产', value: 1 },
+            { label: '生产中', value: 2 },
+            { label: '生产完成', value: 3 },
           ]
         },
         { title: '开始派工时间', name: 'Input', start_server: 'start_time', end_server: 'end_time', start_value: '', end_value: '', isDate: true, serverName: 'id2', start_placeholder: '开始日期', end_placeholder: '结束日期' },

src/views/ProductionOrderList/InboundForm/index.vue

@@ -113,7 +113,7 @@ export default {
         },
         { title: "业务员", align: "center", key: "nickname", minWidth: 150 },
         {
-          title: "订单状态",
+          title: "包装状态",
           align: "center",
           key: "state",
           minWidth: 150,
@@ -121,13 +121,13 @@ export default {
             h(
               "span",
               {},
-              params.row.sub_state == 0
-                ? "未指派"
-                : params.row.sub_state == 1
-                ? "可以派工"
+              // params.row.sub_state == 0
+                // ? "未指派"
+                params.row.sub_state == 1
+                ? "未包装"
                 : params.row.sub_state == 2
-                ? "已派工"
-                : "已完成"
+                ? "包装中"
+                : "包装"
             ),
         },
         {
@@ -186,16 +186,16 @@ export default {
           serverName: "residential_name",
         },
         {
-          title: "订单状态",
+          title: "包装状态",
           name: "Select",
           placeholder: "请选择",
           serverName: "sub_state",
           value: "",
           option: [
-            { label: "未指派", value: 0 },
-            { label: "可以派工", value: 1 },
-            { label: "已派工", value: 2 },
-            { label: "已完成", value: 3 },
+            // { label: "未指派", value: 0 },
+            { label: "未包装", value: 1 },
+            { label: "包装中", value: 2 },
+            { label: "包装完成", value: 3 },
           ],
         },
         {

src/views/ProductionOrderList/ProductionPlanlist/list.vue

@@ -51,6 +51,7 @@
              @click="dispatchList(row)">派工单</a>
         </div>
       </template>
+      
 
       <div>
         <Modal :width='1064'
@@ -68,6 +69,7 @@
                 </CheckboxGroup>
               </div>
             </FormItem>
+             
           </Form>
         </Modal>
       </div>
@@ -105,12 +107,8 @@ export default {
         {
           title: '订单状态', align: 'center', key: 'state', minWidth: 150,
           render: (h, params) => h('span', {},
-            params.row.state == 0 ? '测量未审核'
-              : (params.row.state == 1 ? '测量审核'
-                : (params.row.state == 2 ? '测量通过'
-                  : (params.row.state == 3 ? '生产审核中'
-                    : (params.row.state == 4 ? '生产通过'
-                      : (params.row.state == 5 ? '到生产计划' : (params.row.state == 6 ? '完成' : '-'))))))
+              (params.row.state == 1 ? '未派工'
+                : (params.row.state == 2 ? '已派工':'完成'))
           )
         },
         { title: '业务员', align: 'center', key: 'nickname', minWidth: 150 },
@@ -142,6 +140,7 @@ export default {
       showTableColums: false,
       selects: [],
       tableheaders: [],
+      userList: [],
       //详情页返回保留搜索数据
       corssPageData: localStorage.getItem('corssPageData') ? JSON.parse(localStorage.getItem('corssPageData')) : {},
       warningList: [],
@@ -170,6 +169,8 @@ export default {
   created () {
     // 获取紧急程度
     this.axios.get('/api/warning_list').then(res => { this.warningList = res.data.data })
+    this.axios.get('/api/employee_list').then(res => this.userList = res.data)
+    //this.axios.get('/api/employee_list').then(res => { this.employeeList = res.data })
   },
   computed: {
     ...mapState(['persimissionData']),
@@ -183,7 +184,23 @@ export default {
       return [
         { title: '订单编号', name: 'Input', serverName: 'order_no', placeholder: '请输入订单编号', value: '' },
         { title: '小区名字', name: 'Input', serverName: 'residential_name', placeholder: '请选择', value: '' },
-        { 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",
+          placeholder: "请选择",
+          serverName: "order_type",
+          value: "",
+          option: [
+            { label: "工装", value: 1 },
+            { label: "家装", value: 0 },
+          ],
+        },
+        { title: '计划单号', name: 'Input', serverName: 'plan_no', placeholder: '请填写计划单号', value: '' },
+         {
+          title: '业务员', name: 'Select', serverName: 'nickname', placeholder: '请选择', value: '', optionName: 'nickname', optionValue: 'id',
+          option: this.userList
+        },
+        { 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: 'warning_state', placeholder: '请选择', value: '', optionName: 'title', optionValue: 'id',
           option: this.warningList
@@ -191,14 +208,9 @@ export default {
         {
           title: '订单状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
           option: [
-            { label: '全部', value: 99 },
-            { label: '测量未审核', value: 0 },
-            { label: '测量审核', value: 1 },
-            { label: '测量通过', value: 2 },
-            { label: '生产审核中', value: 3 },
-            { label: '生产通过', value: 4 },
-            { label: '到生产计划', value: 5 },
-            { label: '完成', value: 6 },
+            { label: '未派工', value: 1 },
+            { label: '已派工', value: 2 },
+            { label: '完成', value: 3 },
           ]
         },
       ]

src/views/PurchasingManage/OutstockOrder/list.vue

@@ -111,12 +111,13 @@
             <a style="margin:0 5px"
                @click="handleSet(2,row,index)">详情</a>
             <a style="margin:0 5px"
-               :disabled="row.state==1"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(3,row,index)">编辑</a>
             <a style="margin:0 5px"
                :disabled="row.state==1||row.state==2"
                @click="handleSet(4,row,index)">删除</a>
             <a style="margin:0 5px"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(5,row,index)">提交</a>
           </template>
         </Table>
@@ -245,10 +246,10 @@ export default {
             content: '此操作无法恢复，请确认！',
             onOk: () => {
               this.axios({
-                method: 'get',
-                url: '/api/todo',
+                method: 'post',
+                url: '/api/warehouse_order_out_del',
                 params: {
-                  supply_id: row.supply_id
+                  order_out_no: row.order_out_no
                 }
               }).then((res) => {
                 this.$Message.success(res.msg)
@@ -271,8 +272,10 @@ export default {
                   state: row.state + 1
                 }
               }).then((res) => {
-                this.$Message.success(res.msg)
-                this.initData()
+                if(res.code==200){
+                  this.$Message.success(res.msg)
+                  this.initData()
+                }
               }).catch((err) => { });
             },
             onCancel: () => { }