调拨单修改

src/views/purchase/deliveryAddress/add.vue

@@ -262,6 +262,7 @@ export default {
       if (this.referCondition.type == 'WAREHOUSE_PARAM') {
         this.houseOptions = selection
         this.basicForm.warehouseName = selection[0].name
+        this.basicForm.name = selection[0].name
         this.basicForm.warehouse = selection[0].id
       }
       if (this.referCondition.type == 'CONTACTS_PARAM') {

src/views/purchase/transferOrder/add.vue

@@ -11,7 +11,7 @@
         </el-col>
         <el-col :span="1.5">
             <el-form-item label="订单类型">
-              <el-select v-model="basicForm.billType" size="small" style="width: 200px" clearable>
+              <el-select v-model="basicForm.billType" :disabled="sonDisable" size="small" style="width: 200px" clearable>
                 <el-option v-for="dict in dict.type.sys_allot_billtype" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
@@ -22,6 +22,7 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -32,6 +33,7 @@
               <el-date-picker
                 v-model="basicForm.billDate"
                 size="small"
+                :disabled="sonDisable"
                 type="date"
                 clearable
                 value-format="yyyy-MM-dd"
@@ -41,13 +43,10 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调拨方式">
-              <el-input
-                v-model="basicForm.allotType"
-                size="small"
-                placeholder=""
-                clearable
-                style="width: 200px"
-              />
+              <el-select v-model="basicForm.allotType" :disabled="sonDisable" size="small" style="width: 200px" clearable>
+                <el-option v-for="dict in dict.type.sys_to_type" :key="dict.value" :label="dict.label" :value="dict.value">
+                </el-option>
+              </el-select>
             </el-form-item>
          </el-col>
         <el-col :span="1.5">
@@ -55,7 +54,7 @@
               <el-input
                 v-model="basicForm.deliveryCode"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -66,7 +65,7 @@
               <el-input
                 v-model="basicForm.storageCode"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -118,6 +117,7 @@
               <el-input
                 v-model="basicForm.onRouteAffilliation"
                 size="small"
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -128,7 +128,7 @@
               <el-input
                 v-model="basicForm.qty"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -139,7 +139,7 @@
               <el-input
                 v-model="basicForm.accountPath"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -150,7 +150,7 @@
               <el-input
                 v-model="basicForm.customer"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -161,7 +161,7 @@
               <el-input
                 v-model="basicForm.storageWarehouse"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -172,7 +172,7 @@
               <el-input
                 v-model="basicForm.deliveryWarehouse"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -180,7 +180,7 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="物流项目组">
-              <el-select v-model="basicForm.materialProject" size="small" style="width: 200px" clearable>
+              <el-select v-model="basicForm.materialProject" :disabled="sonDisable" size="small" style="width: 200px" clearable>
                 <el-option v-for="dict in dict.type.sys_project_group" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
@@ -205,7 +205,7 @@
               <el-input
                 v-model="basicForm.remark"
                 size="small"
-                placeholder=""
+                :disabled="sonDisable"
                 clearable
                 style="width: 200px"
               />
@@ -429,7 +429,7 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -440,7 +440,7 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -451,7 +451,7 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -462,7 +462,7 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -477,7 +477,7 @@
               <el-input
                 v-model="basicForm.createByName"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -488,7 +488,7 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -499,7 +499,7 @@
               <el-input
                 v-model="basicForm.updateByName"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -510,7 +510,7 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
-                placeholder=""
+                disabled
                 clearable
                 style="width: 200px"
               />
@@ -546,7 +546,7 @@ import popDialog from '@/components/PopDialog/index.vue'
 
 export default {
   name: 'addOder',
-  dicts: ['sys_allot_billtype', 'sys_project_group', 'sys_status'],
+  dicts: ['sys_allot_billtype', 'sys_project_group', 'sys_status', 'sys_to_type'],
   props: ['pageStu','row', 'disable'],
   components: {
     Refers,
@@ -672,10 +672,10 @@ export default {
       getOrderDetail(row.id).then(res => {
         if (res.code === 200) {
           this.basicForm = res.data
-          // this.materialInfo = res.data.stAllotMaterialList
-          // this.receiveInfo = res.data.stAllotReceiveDeliverList
-          // this.priceList = res.data.stAllotReceiveExecuteList
-          // this.resultList = res.data.stAllotReceiveExpenseList
+          this.materialInfo = res.data.stAllotMaterialList
+          this.receiveInfo = res.data.stAllotReceiveDeliverList
+          this.priceList = res.data.stAllotReceiveExecuteList
+          this.resultList = res.data.stAllotReceiveExpenseList
         }
       })
     },

src/views/purchase/transferOrder/index.vue

@@ -96,9 +96,12 @@
           :data="tableList" 
           fit
           show-summary
+          highlight-current-row
           max-height="680"
+          ref="multipleTable"
+          @row-click="select"
         >
-          <el-table-column label="调出库存" align="center" prop="code"/>
+          <el-table-column label="调出库存" align="center" prop="deliveryInventoryOrgName"/>
           <el-table-column label="订单类型" align="center" prop="billType"/>
           <el-table-column label="单据号" align="center" prop="code"/>
           <el-table-column label="单据日期" align="center" prop="billDate"/>
@@ -162,20 +165,20 @@
             <el-table-column label="行号" align="center" prop="rowno"/>
             <el-table-column label="物料编码" align="center" prop="material"/>
             <el-table-column label="物料名称" align="center" prop="materialName"/>
-            <el-table-column label="调拨出库单号" align="center" prop="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="规格" align="center" prop="code"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="规格" align="center" prop="specification"/>
             <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
             <el-table-column label="产地" align="center" prop="originPlace"/>
             <el-table-column label="型号" align="center" prop="model"/>
-            <el-table-column label="单位" align="center" prop="unit"/>
-            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
+            <el-table-column label="单位" align="center" prop="unitName"/>
+            <!-- <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/> -->
             <el-table-column label="数量" align="center" prop="qty"/>
             <el-table-column label="主单位" align="center" prop="mainUnit"/>
             <el-table-column label="换算率" align="center" prop="equation"/>
             <el-table-column label="主数量" align="center" prop="mainQty"/>
             <el-table-column label="税率" align="center" prop="rate"/>
-            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
+            <!-- <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/> -->
             <el-table-column label="批次号" align="center" prop="patchNo"/>
             <el-table-column label="产品批号" align="center" prop="producBatch"/>
             <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
@@ -191,6 +194,7 @@
             <el-table-column label="pi码" align="center" prop="pi"/>
             <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
             <!-- <el-table-column label="备注" align="center" prop="code"/> -->
+            <el-table-column label="类别" align="center" prop="classify"/>
             <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
             <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
             </el-table>
@@ -360,6 +364,7 @@ export default {
         if (res.code === 200) {
           this.tableList = res.rows
           this.total = res.total
+          this.materialInfo = res.rows[0].stAllotMaterialList
         }
       })
     },
@@ -380,6 +385,11 @@ export default {
       this.rowDetail = row
       this.disable = false
     },
+    // 选中某行
+    select(row) {
+      console.log('选中', row)
+      this.materialInfo = row.stAllotMaterialList
+    },
     // 行内删除
     deleteids(row) {
       console.log('row', row)

vue.config.js

@@ -37,12 +37,12 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
-        target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
+        // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
         // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
         // target: `http://172.16.13.77:8000/drp-admin`, //TQ本地