240123

src/views/storehouse/inventory/MyPercentageFormStorage1.vue

@@ -51,7 +51,7 @@ const ProductselectionChange = (selection: any[], row: any) => emit('ontableData
 
 //函数
 const selectFun = async (val: any) => {
-  console.log('选中1111', val,selectTable.value,selectProductData.value)
+  // console.log('选中1111', val,selectTable.value,selectProductData.value)
   if (val?.length) {//已经选中的传值项
     // 设置产品的选中
     tableProductData.value.forEach((row: any) => {
@@ -82,13 +82,15 @@ const getProductList = async () => {
 
 const productColumns = [
   { type: 'selection', width: 80 },
-  { prop: 'T_img', label: '产品图片', name: 'T_img' },
-  { prop: 'T_name', label: '产品名称' },
-  { prop: 'T_class_name', label: '产品分类' },
-  { prop: 'T_model', label: '产品型号', ellipsis: true },
-  { prop: 'T_spec', label: '产品规格' },
-  { prop: 'T_relation_sn', label: '关联SN', name: 'T_relation_sn' },
-  { prop: 'T_remark', label: '备注', ellipsis: true }
+  // { prop: 'T_img', label: '产品图片', name: 'T_img' },
+  { prop: 'T_name', label: '验证项目' },
+  { prop: 'T_price', label: '单价（元）' },
+  
+  // { prop: 'T_class_name', label: '产品分类' },
+  // { prop: 'T_model', label: '产品型号', ellipsis: true },
+  // { prop: 'T_spec', label: '产品规格' },
+  // { prop: 'T_relation_sn', label: '关联SN', name: 'T_relation_sn' },
+  // { prop: 'T_remark', label: '备注', ellipsis: true }
 ]
 
 const openDrawer = () => drawerProductRef.value?.openDrawer()
@@ -118,7 +120,7 @@ interface User {
 }
 
 const toggleSelectionFun = (rows?: User[]) => {
-  console.log('selectTable.value',selectTable.value,rows)
+  // console.log('selectTable.value',selectTable.value,rows)
   if (rows) {
     rows.forEach((row) => {
       selectTable.value!.toggleRowSelection(row, undefined)
@@ -142,7 +144,7 @@ defineExpose({
 </script>
 
 <template>
-  <Drawer ref="drawerProductRef" :handleClose="callbackProductDrawer" size="70%">
+  <Drawer ref="drawerProductRef" :handleClose="callbackProductDrawer">
     <template #header="{ params }">
       <h4 :id="params.titleId" :class="params.titleClass">选择</h4>
     </template>
@@ -155,7 +157,7 @@ defineExpose({
         @select="ProductselectionChange" @select-all="ProductSelectionAllChange">
         <template v-for="item in productColumns" :key="item">
           <el-table-column v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
-          <el-table-column v-if="!item.ellipsis && item.prop" v-bind="item">
+          <el-table-column v-if="item.prop" v-bind="item">
             <template #default="{ row }">
               <span v-if="item.prop === 'T_relation_sn'">
                 <el-tag v-if="row.T_relation_sn === 1" effect="dark">是</el-tag>
@@ -164,7 +166,7 @@ defineExpose({
               <ImageCom v-if="item.prop === 'T_img'" :src="row.T_img" />
             </template>
           </el-table-column>
-          <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
+          <!-- <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
             <template #default="{ row }">
               <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
                 {{ row.T_model }}
@@ -180,7 +182,7 @@ defineExpose({
                 {{ row.T_remark }}
               </el-tooltip>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </template>
       </el-table>
     </el-card>

src/views/storehouse/sales/verifyxiang.vue

@@ -161,6 +161,10 @@ onUnmounted(() => {
 const drawerverifyRef = ref<InstanceType<typeof Drawer> | null>(null)
 const openDrawer = () => drawerverifyRef.value?.openDrawer()
 
+const hiedDrawer = async ()=>{
+    drawerverifyRef.value?.closeDrawer()
+}
+
 defineExpose({
   openDrawer,getStorehouseContractGet
 })
@@ -317,7 +321,7 @@ defineExpose({
                         @click="contractApproval(2)">审核不通过</el-button>
                     <el-button v-if="info?.T_State === 3 && isSale" type="success" round
                         @click="contractApproval(1)">审核通过</el-button>
-                    <el-button type="primary" round @click="router.back()">返回</el-button>
+                    <el-button type="primary" round @click="hiedDrawer">关闭窗口</el-button>
                 </div>
             </div>
             <Drawer ref="drawerSnRef" :handleClose="callbackSnDrawer" size="30%">