黄梓星 1 år sedan
förälder
incheckning
65dedc4814

+ 1 - 0
src/views/purchase/DemandSummary/add.vue

@@ -17,6 +17,7 @@
           :header-cell-style="{ borderColor: '#c0c0c0' }"
           class="exporttable"
           border
+          highlight-current-row
           max-height="580"
           style="font-size: 12px;"
           @selection-change="handleSelectionChange"

+ 1 - 0
src/views/purchase/DemandSummary/index.vue

@@ -228,6 +228,7 @@
           border
           show-summary
           :summary-method="getSummaries"
+          highlight-current-row
           height="355"
           max-height="355"
           style="font-size: 12px;"

+ 11 - 2
src/views/purchase/PurchaseDemandList/add.vue

@@ -44,7 +44,7 @@
 
         <el-col :span="1.5">
           <el-form-item label="需求计划">
-            <el-select v-model="basicForm.planType" size="mini" style="width: 200px">
+            <el-select :disabled="sonDisable" v-model="basicForm.planType" size="mini" style="width: 200px">
               <el-option v-for="dict in dict.type.sys_plan_type" :key="dict.value" :label="dict.label" :value="dict.value">
               </el-option>
             </el-select>
@@ -84,7 +84,7 @@
 
         <el-col :span="1.5">
           <el-form-item label="是否客户指定">
-            <el-select clearable v-model="basicForm.isCustomerSpecified" :disabled="sonDisable" size="mini" style="width: 200px">
+            <el-select clearable @change="isCustomer" v-model="basicForm.isCustomerSpecified" :disabled="sonDisable" size="mini" style="width: 200px">
               <el-option v-for=" item in options" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -171,6 +171,7 @@
           :data="basicForm.puDemandItemList.slice(0, over)"
           fit
           border
+          highlight-current-row
           :cell-style="{ borderColor: '#c0c0c0' }"
           :header-cell-style="{ borderColor: '#c0c0c0' }"
           class="exporttable"
@@ -660,6 +661,14 @@ export default {
         this.basicForm.puDemandItemList.forEach(item => { item.isUrgency = 'N' })
       }
     },
+    // 改变是否客户指定
+    isCustomer() {
+      if (this.basicForm.isCustomerSpecified == 'Y' && this.basicForm.puDemandItemList.length != 0) {
+        this.basicForm.puDemandItemList.forEach(item => {item.isCustomerSpecified = 'Y'})
+      } else {
+        this.basicForm.puDemandItemList.forEach(item => {item.isCustomerSpecified = 'N'})
+      }
+    },
     hangStatus(row) {
       switch (row.status) {
         case '0':

+ 1 - 0
src/views/purchase/PurchaseDemandList/index.vue

@@ -167,6 +167,7 @@
           class="exporttable"
           max-height="410"
           border
+          highlight-current-row
           style="font-size: 12px;"
           @selection-change="handleSelectionChange"
         >

+ 103 - 128
src/views/purchase/transferOrder/add.vue

@@ -18,6 +18,76 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="调出部门">
+              <el-select clearable :disabled="sonDisable || isOrg"
+                size="mini"
+                v-model="basicForm.deliveryDept"
+                @focus="chooseRefer('DEPT_PARAM', true, '调出部门', basicForm.deliveryInventoryOrg)"
+                style="width: 200px"
+              >
+                <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="调出仓库">
+              <el-select clearable :disabled="sonDisable || isOrg"
+                size="mini"
+                v-model="basicForm.deliveryWarehouse"
+                @clear="clean('调出仓库')"
+                @change="controlDCHW"
+                @focus="chooseRefer('WAREHOUSE_PARAM', true, '调出仓库', basicForm.deliveryInventoryOrg, 'N', 'N')"
+                style="width: 200px"
+              >
+                <el-option v-for="item in chuHouseOptions" :key="item.id" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+      
+          <el-col :span="1.5">
+            <el-form-item label="调出业务员">
+              <el-select clearable :disabled="sonDisable"
+                size="mini"
+                v-model="basicForm.businessPersonal"
+                @clear="clean('调出业务员')"
+                @focus="chooseRefer('CONTACTS_PARAM', true, '调出业务员')"
+                style="width: 200px"
+              >
+                <el-option v-for="item in manOptions" :key="item.id" :label="item.name" :value="item.code"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="调入库存组织">
+              <el-select clearable :disabled="sonDisable" size="mini" v-model="basicForm.storageInventoryOrg"
+                @clear="clean('调入库存组织')"
+                @change="controlCk('调入库存组织')"
+                @focus="chooseRefer('ORG_PARAM', true, '调入库存组织')"
+                style="width: 200px"
+              >
+                <el-option v-for="item in ruOrgOptions" :key="item.id" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="调入仓库">
+              <el-select clearable :disabled="sonDisable || isOrg"
+                size="mini"
+                v-model="basicForm.storageWarehouse"
+                @clear="clean('调入仓库')"
+                @change="controlDRHW"
+                @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库', basicForm.storageInventoryOrg, 'N', 'N')"
+                style="width: 200px"
+              >
+                <el-option v-for="item in ruHouseOptions" :key="item.id" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label="订单类型">
               <el-select clearable v-model="basicForm.billType" :disabled="sonDisable" size="mini" style="width: 200px">
                 <el-option v-for="dict in dict.type.sys_allot_billtype" :key="dict.value" :label="dict.label" :value="dict.value">
@@ -27,6 +97,15 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="调拨方式">
+              <el-select clearable disabled v-model="basicForm.allotType" size="mini" style="width: 200px">
+                <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">
             <el-form-item label="单据号">
               <el-input clearable :disabled="sonDisable" v-model="basicForm.code" size="mini" style="width: 200px"/>
             </el-form-item>
@@ -44,15 +123,6 @@
           </el-col>
 
           <el-col :span="1.5">
-            <el-form-item label="调拨方式">
-              <el-select clearable disabled v-model="basicForm.allotType" size="mini" style="width: 200px">
-                <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">
             <el-form-item label="调拨出库单号">
               <el-input
                 v-model="basicForm.deliveryCode"
@@ -77,46 +147,6 @@
           </el-col>
 
           <el-col :span="1.5">
-            <el-form-item label="调入库存组织">
-              <el-select clearable :disabled="sonDisable" size="mini" v-model="basicForm.storageInventoryOrg"
-                @clear="clean('调入库存组织')"
-                @change="controlCk('调入库存组织')"
-                @focus="chooseRefer('ORG_PARAM', true, '调入库存组织')"
-                style="width: 200px"
-              >
-                <el-option v-for="item in ruOrgOptions" :key="item.id" :label="item.name" :value="item.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="调出业务员">
-              <el-select clearable :disabled="sonDisable"
-                size="mini"
-                v-model="basicForm.businessPersonal"
-                @clear="clean('调出业务员')"
-                @focus="chooseRefer('CONTACTS_PARAM', true, '调出业务员')"
-                style="width: 200px"
-              >
-                <el-option v-for="item in manOptions" :key="item.id" :label="item.name" :value="item.code"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="调出部门">
-              <el-select clearable :disabled="sonDisable || isOrg"
-                size="mini"
-                v-model="basicForm.deliveryDept"
-                @focus="chooseRefer('DEPT_PARAM', true, '调出部门', basicForm.deliveryInventoryOrg)"
-                style="width: 200px"
-              >
-                <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
             <el-form-item label="币种">
               <el-select clearable :disabled="sonDisable"
                 size="mini"
@@ -130,19 +160,6 @@
           </el-col>
 
           <el-col :span="1.5">
-            <el-form-item label="折本汇率">
-              <el-input-number
-                v-model="basicForm.rate" size="mini" disabled :precision="2" :step="0.1" :max="10" style="width: 200px"></el-input-number>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="在途归属">
-              <el-input clearable disabled v-model="basicForm.onRouteAffilliation" size="mini" style="width: 200px"/>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
             <el-form-item label="总数量">
               <el-input clearable :disabled="sonDisable" v-model="basicForm.qty" type="number" min="0" size="mini" style="width: 200px"/>
             </el-form-item>
@@ -155,6 +172,13 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="折本汇率">
+              <el-input-number
+                v-model="basicForm.rate" size="mini" disabled :precision="2" :step="0.1" :max="10" style="width: 200px"></el-input-number>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label="客户">
               <el-select clearable :disabled="sonDisable"
                 size="mini"
@@ -168,95 +192,51 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="调入仓库">
-              <el-select clearable :disabled="sonDisable || isOrg"
-                size="mini"
-                v-model="basicForm.storageWarehouse"
-                @clear="clean('调入仓库')"
-                @change="controlDRHW"
-                @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库', basicForm.storageInventoryOrg, 'N', 'N')"
-                style="width: 200px"
-              >
-                <el-option v-for="item in ruHouseOptions" :key="item.id" :label="item.name" :value="item.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="调出仓库">
-              <el-select clearable :disabled="sonDisable || isOrg"
-                size="mini"
-                v-model="basicForm.deliveryWarehouse"
-                @clear="clean('调出仓库')"
-                @change="controlDCHW"
-                @focus="chooseRefer('WAREHOUSE_PARAM', true, '调出仓库', basicForm.deliveryInventoryOrg, 'N', 'N')"
-                style="width: 200px"
-              >
-                <el-option v-for="item in chuHouseOptions" :key="item.id" :label="item.name" :value="item.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
           
           <el-col :span="1.5">
             <el-form-item label="物流项目组">
-              <el-select
-                v-model="basicForm.materialProject"
-                :disabled="sonDisable"
+              <el-select clearable :disabled="sonDisable" v-model="basicForm.materialProject"
                 size="mini"
                 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 v-for="dict in dict.type.sys_project_group" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="1.5">
             <el-form-item label="利润中心">
-              <el-select
-                clearable
+              <el-select clearable :disabled="sonDisable"
                 size="mini"
                 v-model="basicForm.liacenter"
-                :disabled="sonDisable"
                 @clear="clean('利润中心')"
                 @focus="chooseTreeRefer('LIACENTER_PARAM', false, '利润中心')"
                 style="width: 200px"
               >
-                <el-option
-                  v-for="item in liacenterOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in liacenterOptions" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="在途归属">
+              <el-input clearable disabled v-model="basicForm.onRouteAffilliation" size="mini" style="width: 200px"/>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="1.5">
             <el-form-item label="单据状态">
-              <el-select
-                disabled
-                v-model="basicForm.status"
+              <el-select disabled v-model="basicForm.status"
                 size="mini"
                 style="width: 200px"
-                clearable
               >
-                <el-option
-                  v-for="dict in dict.type.sys_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                >
+                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="1.5">
             <el-form-item label="备注">
               <el-input
@@ -301,14 +281,9 @@
         <el-tabs style="margin-top: 10px" type="border-card">
           <el-tab-pane label="物料信息">
             <div class="btn_grooup">
-              <el-button
-                type="primary"
-                size="mini"
-                v-if="!sonDisable"
-                @click="addLine"
-                >增行</el-button
-              >
+              <el-button type="primary" size="mini" v-if="!sonDisable" @click="addLine">增行</el-button>
             </div>
+            
             <el-table
               :data="materialInfo"
               fit