bug修改

src/views/purchase/DemandSummary/add.vue

@@ -71,7 +71,7 @@
         <el-table-column show-overflow-tooltip label="需求单单号" align="center" prop="code" width="150"/>
         <el-table-column show-overflow-tooltip label="供应仓库" align="center" prop="lastWarehouseName" width="150"/>
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="150"/>
-        <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="billType" width="150"/>
+        <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="billType" width="150" :formatter="formatterBillType"/>
         <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="150"/>
         <el-table-column show-overflow-tooltip label="收货货位" align="center" prop="deliveryAllocationName" width="200">
           <template slot-scope="scope">
@@ -170,6 +170,24 @@ export default {
             return '调货价'
         }
       },
+      formatterBillType(row) {
+        switch (row.billType) {
+          case 'ZQBH':
+            return '周期备货'
+          case 'FXXQ':
+            return '分销需求'
+          case 'TSXQ':
+            return '特殊采购需求'
+          case 'BDXQ':
+            return '补单需求'
+          case 'JJXQ':
+            return '紧急需求单'
+          case 'XPXQ':
+            return '新品需求'
+          case 'HZBM':
+            return '合作部门需求'
+        }
+      },
       // 不能直接改变props传来的值
       sonPageStu: this.pageStu,
       sonDisable: this.disable,

src/views/purchase/MaterialClassDivision/index.vue

@@ -220,7 +220,7 @@
           <el-table-column show-overflow-tooltip label="二级分类名称" align="center" width="150" prop="materialClassifyTwoName" />
           <el-table-column show-overflow-tooltip label="三级分类名称" align="center" width="150" prop="materialClassifyThreeName"/>
           <el-table-column show-overflow-tooltip label="四级分类名称" align="center" width="150" prop="materialClassifyFourName" />
-          <el-table-column show-overflow-tooltip label="物料编码" align="center" width="150" prop="material" />
+          <el-table-column show-overflow-tooltip label="物料编码" align="center" width="150" prop="materialCode" />
           <el-table-column show-overflow-tooltip label="物料名称" align="center" prop="materialName" />
           <el-table-column show-overflow-tooltip label="生产厂商" align="center" width="150" prop="manufacturer" />
           <el-table-column show-overflow-tooltip label="所属组织" align="center" width="120" prop="orgName"/>

src/views/purchase/PurchaseDemandList/add.vue

@@ -212,7 +212,7 @@
           <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'materialCode'" :rules="{ required: true, message: '请选择物料编码', trigger: 'blur' }">
-                <el-input clearable :disabled="sonDisable" size="mini" v-model="scope.row.materialCode" @focus="chooseMaterial(scope.$index)">
+                <el-input clearable :disabled="sonDisable" size="mini" v-model="scope.row.materialCode" @paste.native="pasteMe($event, scope)">
                   <el-button size="mini" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseMaterial(scope.$index)"></el-button>
                 </el-input>
               </el-form-item>
@@ -246,7 +246,7 @@
             <el-table-column show-overflow-tooltip label="预留比例" align="center" prop="reservedProportion" width="150px">
               <template slot-scope="scope">
                 <el-form-item class="hang">
-                  <el-select clearable :disabled="sonDisable" size="mini" v-model="scope.row.reservedProportion" @change="getYLSL(scope)">
+                  <el-select clearable :disabled="sonDisable" size="mini" v-model="scope.row.reservedProportion" @change="getYLSL(scope)" @clear="scope.row.reservedQty = ''">
                     <el-option v-for=" dict in dict.type.sys_reserve_ratio" :key="dict.value" :label="dict.label" :value="dict.value">
                     </el-option>
                   </el-select>
@@ -1116,6 +1116,17 @@ export default {
         this.basicForm.puDemandItemList[this.tableIndex].address = selection[0].address
       }
     },
+    // 粘贴来的数据
+    pasteMe(e, socpe) {
+      e.preventDefault() //阻止默认粘贴事件
+      let source = e.clipboardData.getData("Text");
+      console.log('eee:', source)
+      // 首先对源头进行解析
+      let rows = source.split("\r\n"); // 拆成一个数组
+      rows.pop()
+      console.log('复制的数组',rows);
+      console.log('列表的数组',this.basicForm.puDemandItemList)
+    },
     // 明细行选择物料编码带出数据
     chooseMaterial(index) {
       console.log("🚀 ~ file: add.vue:790 ~ chooseMaterial ~ index:", index)

src/views/purchase/PurchaseDemandList/reserved.vue

@@ -82,6 +82,8 @@
         <el-table-column show-overflow-tooltip prop="allocationName" label="货位名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="qty" label="可用量" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="usedQty" label="已用量" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="createTime" label="创建时间" width="200"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="updateTime" label="更新时间" width="200"></el-table-column>
       </el-table>
       <el-table style="margin-top: 50px" :data="tableList3">
         <el-table-column show-overflow-tooltip prop="material" label="物料编码" width="150"></el-table-column>
@@ -89,6 +91,7 @@
         <!-- <el-table-column show-overflow-tooltip prop="unit" label="单位" width="150"></el-table-column> -->
         <el-table-column show-overflow-tooltip prop="unitName" label="单位名称" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="reservedQty" label="预留数量" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="allotQty" label="操作数量" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="reservedProportion" label="预留比例" width="150"></el-table-column>
         <el-table-column show-overflow-tooltip prop="reservedPeriod" label="预留周期" width="150"></el-table-column>
         <!-- <el-table-column show-overflow-tooltip prop="deliveryWarehouse" label="调出仓库" width="150"></el-table-column> -->
@@ -99,7 +102,8 @@
         <el-table-column show-overflow-tooltip prop="storageWarehouseName" label="调入仓库名称" width="150"></el-table-column>
         <!-- <el-table-column show-overflow-tooltip prop="storageAllocation" label="调入货位" width="150"></el-table-column> -->
         <el-table-column show-overflow-tooltip prop="storageAllocationName" label="调入货位名称" width="150"></el-table-column>
-        <el-table-column show-overflow-tooltip prop="allotQty" label="操作数量" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="createTime" label="创建时间" width="200"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="updateTime" label="更新时间" width="200"></el-table-column>
       </el-table>
     </el-dialog>
   </div>