Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/api/purchase/basic.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取物料分工列表
 export function getDivisionList(data) {
   return request({
-    url: `/material/division/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    url: `/material/division/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}&isAsc=desc&orderByColumn=updateTime`,
     method: 'post',
     data: data
   })

src/api/purchase/deliveryAddress.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取收货地址档案列表
 export function getAddressList(data) {
   return request({
-    url: `/pu/delivery/address/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    url: `/pu/delivery/address/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}&isAsc=desc&orderByColumn=updateTime`,
     method: 'post',
     data: data
   })

src/api/purchase/transferOrder.js

@@ -47,6 +47,14 @@ export function delOrder(ids) {
     method: 'delete',
   })
 }
+// 调拨订单重传NC
+export function againToNC(data) {
+  return request({
+    url: `/pu/allot/toNC`,
+    method: 'post',
+    data: data
+  })
+}
 // 货权预留单详情
 export function getResevedDetail(id) {
   return request({

src/views/purchase/MaterialClassDivision/add.vue

@@ -351,7 +351,7 @@ export default {
       this.$emit('jugislist', true)
       let queryParams = {
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       }
       this.$emit('refresh', queryParams)
     },

src/views/purchase/deliveryAddress/add.vue

@@ -19,7 +19,7 @@
               <el-input
                 v-model="basicForm.name"
                 size="mini"
-                :disabled="disable"
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -92,7 +92,7 @@
 
          <el-col :span="1.5">
             <el-form-item label="启用">
-              <el-select v-model="basicForm.status" size="mini" style="width: 200px" clearable :disabled="disable">
+              <el-select disabled v-model="basicForm.status" size="mini" style="width: 200px">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
@@ -181,8 +181,8 @@ export default {
         contactsPhone: '',
         materialClassify: '',
         materialClassifyName: '',
-        status: '',
-        sendStatus: '2',
+        status: 'Y',
+        sendStatus: 'N',
         remark: '',
       },
       referCondition: {

src/views/purchase/deliveryAddress/index.vue

@@ -176,21 +176,29 @@
         >
           <el-table-column show-overflow-tooltip type="selection" width="55" />
           <el-table-column show-overflow-tooltip label="仓库属性" align="center" prop="warehouseProperty"/>
-          <el-table-column show-overflow-tooltip label="仓库档案名称" align="center" width="200" prop="warehouseCode"/>
-          <el-table-column show-overflow-tooltip label="收货仓库编码" align="center" prop="code" />
+          <el-table-column show-overflow-tooltip label="仓库档案名称" align="center" width="200" prop="warehouseName"/>
+          <el-table-column show-overflow-tooltip label="收货仓库编码" align="center" prop="code" width="150"/>
           <el-table-column show-overflow-tooltip label="收货仓库名称" align="center" width="150" prop="name"/>
           <el-table-column show-overflow-tooltip label="详细地址" align="center" width="150" prop="address"/>
           <el-table-column show-overflow-tooltip label="物料分类" align="center" width="150" prop="materialClassifyName" />
           <el-table-column show-overflow-tooltip label="联系人" align="center" width="150" prop="contactsName" />
-          <el-table-column show-overflow-tooltip label="联系人电话" align="center" prop="contactsPhone" />
+          <el-table-column show-overflow-tooltip label="联系人电话" align="center" prop="contactsPhone" width="150" />
           <el-table-column show-overflow-tooltip label="NC档案ID" align="center" width="150" prop="createTime" />
           <el-table-column show-overflow-tooltip label="备注" align="center" width="120" prop="remark" />
           <el-table-column show-overflow-tooltip label="创建人" align="center" width="150" prop="createByName" />
           <el-table-column show-overflow-tooltip label="创建时间" align="center" width="150" prop="createTime" />
           <el-table-column show-overflow-tooltip label="修改人" align="center" width="150" prop="updateByName" />
           <el-table-column show-overflow-tooltip label="修改时间" align="center" width="150" prop="updateTime" />
-          <el-table-column show-overflow-tooltip label="同步状态" align="center" width="150" prop="sendStatus" />
-          <el-table-column show-overflow-tooltip label="启用" align="center" width="150" prop="status" />
+          <el-table-column show-overflow-tooltip label="同步状态" align="center" width="150" prop="sendStatus">
+            <template slot-scope="scope">
+              {{ scope.row.sendStatus == 'Y' ? '已同步' : '未同步'}}
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="启用" align="center" width="150" prop="status">
+            <template slot-scope="scope">
+              {{ scope.row.status == 'Y' ? '启用' : '停用' }}
+            </template>
+          </el-table-column>
           <el-table-column
           fixed="right"
           label="操作"

src/views/purchase/purchase-order/add/index.vue

@@ -40,6 +40,7 @@ export default {
       },
       tabColumns: NewTabColumns,
       tabName: "puOrderItemList",
+      isCopy:false,
     };
   },
   computed: {},
@@ -64,46 +65,56 @@ export default {
       },
       deep: true,
     },
-    params: {
-      handler(nVal, oVal) {
-        // 组织变化
-        if (this.visible && nVal.puOrg != oVal.puOrg) {
-          for (const key in this.params) {
-            if (Array.isArray(this.params[key])) {
-              this.params[key] = [];
-            } else if (
-              key != "puOrg" &&
-              key != "puOrgName" &&
-              key != "buyer" &&
-              key != "buyerName" &&
-              key != "puDept" &&
-              key != "puDeptName" &&
-              key != "status"
-            ) {
-              this.params[key] = "";
-            } else {
-            }
-          }
-        }
-      },
-      deep: true,
-    },
+    // "params.puOrg": {
+    //   handler(nVal, oVal) {
+    //     console.log('nVal', nVal, 'oVal',oVal);
+    //     console.log(this.isCopy, 'this.isCopy');
+    //     // 组织变化
+    //     // if (this.visible && nVal.puOrg != oVal.puOrg) {
+    //     if (this.visible && oVal && nVal != oVal) {
+    //       for (const key in this.params) {
+    //         if (Array.isArray(this.params[key])) {
+    //           this.params[key] = [];
+    //         } else if (
+    //           key != "puOrg" &&
+    //           key != "puOrgName" &&
+    //           key != "buyer" &&
+    //           key != "buyerName" &&
+    //           key != "puDept" &&
+    //           key != "puDeptName" &&
+    //           key != "status"
+    //         ) {
+    //           this.params[key] = "";
+    //         } else {
+    //         }
+    //       }
+    //     }
+    //   },
+    //   deep: true,
+    // },
   },
   methods: {
     beforeOpen() {
-      const { deptName, deptId, name, nickName, orgName, orgId } = this.$store.state.user;
-      this.params.puOrg = orgId;
-      this.params.puOrgName = orgName;
-      this.params.buyer = name;
-      this.params.buyerName = nickName;
-      this.params.puDept = deptId;
-      this.params.puDeptName = deptName;
-      this.params.billDate = new Date().Format('yyyy-MM-dd');
-      this.addTableRow();
+
+      if(!this.isCopy){
+
+        const { deptName, deptId, name, nickName, orgName, orgId } = this.$store.state.user;
+        this.params.puOrg = orgId;
+        this.params.puOrgName = orgName;
+        this.params.buyer = name;
+        this.params.buyerName = nickName;
+        this.params.puDept = deptId;
+        this.params.puDeptName = deptName;
+        this.params.billDate = new Date().Format('yyyy-MM-dd');
+        console.log(this.params,'this.params');
+        this.addTableRow();
+      }
     },
-    setVisible(prop) {
+    setVisible(prop,iscopy) {
       this.visible = prop;
 
+      this.isCopy = iscopy;
+
       if(!this.visible){
         this.$refs['orderAddForm'].clearValidate();
       }
@@ -372,6 +383,37 @@ export default {
         })
         
       }
+
+      // 组织
+      if(type === 'ORG_PARAM'){
+
+          for (const key in this.params) {
+
+            // if (Array.isArray(this.params[key])) {
+            if (key === 'puOrderItemList' || key === 'puOrderExecuteList') {
+
+              this.params[key] = [];
+
+            }
+            else if(key === 'sysFileRecordList'){
+              this.params[key] = [];
+            }
+             else if (
+              key != "puOrg" &&
+              key != "puOrgName" &&
+              key != "buyer" &&
+              key != "buyerName" &&
+              key != "puDept" &&
+              key != "puDeptName" &&
+              key != "status"
+            ) {
+              this.params[key] = "";
+            } else {
+            }
+          }
+        
+
+      }
     },
 
     // 下拉框选择改变

src/views/purchase/purchase-order/index.vue

@@ -117,7 +117,7 @@ export default {
     // 新增
     handleOpenAddDrawer(copyVal) {
       const { setVisible, setCopyParams } = this.$refs.addDrawerFef;
-      setVisible(true);
+      setVisible(true,(copyVal.id && copyVal.id != '') ? true :false);
 
       copyVal.id && copyVal.id != '' && setCopyParams(copyVal.id);
     },

src/views/purchase/transferOrder/add.vue

@@ -596,6 +596,9 @@
         <el-button type="primary" size="mini" plain @click="copy" v-if="sonPageStu == 'check'">复制</el-button>
       </el-col> -->
       <el-col :span="1.5">
+        <el-button type="danger" size="mini" plain @click="toNC" v-if="sonPageStu == 'check' && row.status == '2'">重传NC</el-button>
+      </el-col>
+      <el-col :span="1.5">
         <el-button type="primary" size="mini" plain @click="save" v-if="sonPageStu == 'add' || sonPageStu == 'edit'">保存</el-button>
       </el-col>
       <el-col :span="1.5" style="margin: 0 10px;">
@@ -614,7 +617,7 @@
 </template>
 
 <script>
-import {addOrder, getOrderDetail, editOrder, submitOrder} from '@/api/purchase/transferOrder.js'
+import {addOrder, getOrderDetail, editOrder, submitOrder, againToNC } from '@/api/purchase/transferOrder.js'
 import Refers from '@/components/Refers/refers.vue'
 // 用于回显参照框数据
 import { getRefer } from '@/api/purchase/basic.js'
@@ -791,6 +794,9 @@ export default {
     copy() {
 
     },
+    toNC() {
+      againToNC(this.row).then(res => {})
+    },
     submit() {
       this.basicForm.stAllotMaterialList = this.materialInfo
       this.basicForm.stAllotReceiveDeliverList = this.receiveInfo