zhouhao 2 tahun lalu
induk
melakukan
4a5bb3b43c

+ 9 - 0
src/components/template/template-page-1.vue

@@ -275,6 +275,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@font-face {
+  font-family: "aliyun_iconfont";
+  src: url("//at.alicdn.com/t/font_2075393_0cjq4n8ykvds.woff2?t=1647587689181")
+  format("woff2"),
+  url("//at.alicdn.com/t/font_2075393_0cjq4n8ykvds.woff?t=1647587689181")
+  format("woff"),
+  url("//at.alicdn.com/t/font_2075393_0cjq4n8ykvds.ttf?t=1647587689181")
+  format("truetype");
+}
 
 ::v-deep .el-table__cell {
   padding: 0 !important;

+ 6 - 5
src/views/sales_control/components/WarehouseForm.vue

@@ -115,12 +115,13 @@ export default {
     },
     confirm(selected) {
       // console.log(selected)
-      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
-        selected.forEach(l=>{
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.map(k=>{
+        selected.map(l=>{
           if ( l.id == k.id){
             // k.disabled = true
             this.$set(k,'disabled',false)
-          }else {
+          }
+          else {
             this.$set(k,'disabled',true)
 
           }
@@ -150,8 +151,8 @@ export default {
     delChange() {
       if (this.dataList.length){
         this.dataList =  this.resArr(this.dataList,this.selection)
-        this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
-          this.selection.forEach(l=>{
+        this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.map(k=>{
+          this.selection.map(l=>{
             if ( l.id == k.id){
               this.$set(k,'disabled',true)
             }

+ 41 - 30
src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -3,22 +3,32 @@
     <el-page-header @back="$parent.pageType=0" :content="detailsId?'编辑':'新增'" style=" padding: 20px 20px 0 20px;"
     ></el-page-header>
     <sales-header ref="header" />
-    <sales-table :dataList="dataList" :column="column" isOperation isSelection @handleSelection="handleSelection">
+    <sales-table :dataList="dataList" :column="column" :isOperation="detailsId ?false:true" isSelection
+                 @handleSelection="handleSelection"
+    >
       <template #bts>
-        <div>
-          <el-button v-if="!this.detailsId" type="primary" size="mini" @click="dialogVisible=true">添加</el-button>
-          <el-button type="danger" size="mini" @click="delChange">删除</el-button>
+        <div v-if="!detailsId ">
+          <el-button type="primary" v-if="dis"
+                     size="mini" @click="dialogVisible=true"
+          >添加
+          </el-button>
+          <el-button type="danger" v-if="dis"
+                     size="mini" @click="delChange"
+          >删除
+          </el-button>
         </div>
       </template>
       <template #events>
         <div v-if="!detailsId">
           <el-button type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
-          <el-button size="mini" @click="onReset">重置</el-button>
+          <el-button size="mini" @click="onReset" v-if="dis"
+          >重置
+          </el-button>
           <el-button size="mini" :disabled="dis" @click="handleInform(2)">通知发货</el-button>
         </div>
         <div v-else>
           <el-button type="primary" size="mini" @click="handelSubmit(2)">保存</el-button>
-          <el-button size="mini" @click="onReset">重置</el-button>
+          <el-button size="mini" v-if="!detailsId" @click="onReset">重置</el-button>
         </div>
       </template>
       <template v-slot:custom="{item:{row,$index}}">
@@ -27,6 +37,7 @@
       </template>
       <template v-slot:operation="{item:{row,$index}}">
         <el-popconfirm
+          v-if="dis"
           style="margin-left: 10px"
           title="删除?"
           @onConfirm="handleDel(row,$index)"
@@ -117,7 +128,7 @@ export default {
     } else {
       Object.assign(this.$data, this.$options.data())
 
-      this.column.splice(3,0,
+      this.column.splice(3, 0,
         {
           prop: 'stockQty',
           label: '库存数量',
@@ -140,24 +151,24 @@ export default {
       return func(...p)
     },
     confirm(selected) {
-      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
-        selected.forEach(l=>{
-          if ( l.id == k.id){
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.map(k => {
+        selected.map(l => {
+          if (l.id == k.id) {
             // k.disabled = true
-            this.$set(k,'disabled',false)
-          }else {
-            this.$set(k,'disabled',true)
+            this.$set(k, 'disabled', false)
+          }  else {
+            this.$set(k, 'disabled', true)
 
           }
         })
       })
-      this.dataList = [...this.dataList,...selected]
-      console.log(selected,this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData)
-        if (!this.detailsId){
-          this.$refs.header.screenForm.customerName = this.dataList[0].customerName
-          this.$refs.header.screenForm.customerNumber = this.dataList[0].customerNumber
-          this.$refs.header.screenForm.stockType = this.dataList[0].stockType
-        }
+      this.dataList = [...this.dataList, ...selected]
+      console.log(selected, this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData)
+      if (!this.detailsId) {
+        this.$refs.header.screenForm.customerName = this.dataList[0].customerName
+        this.$refs.header.screenForm.customerNumber = this.dataList[0].customerNumber
+        this.$refs.header.screenForm.stockType = this.dataList[0].stockType
+      }
 
       this.customerNumber = this.dataList[0].customerNumber
       this.dialogVisible = false
@@ -165,9 +176,9 @@ export default {
     },
     handleDel(item, index) {
       this.dataList.splice(index, 1)
-      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.find(k=>{
-        if (k.id==item.id){
-          this.$set(k,'disabled',true)
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.find(k => {
+        if (k.id == item.id) {
+          this.$set(k, 'disabled', true)
           return
         }
       })
@@ -186,16 +197,16 @@ export default {
       return arr1.filter(v => arr2.every(val => val.id != v.id))
     },
     delChange() {
-      if (this.dataList.length){
-        this.dataList =  this.resArr(this.dataList,this.selection)
-        this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
-          this.selection.forEach(l=>{
-            if ( l.id == k.id){
-              this.$set(k,'disabled',true)
+      if (this.dataList.length) {
+        this.dataList = this.resArr(this.dataList, this.selection)
+        this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.map(k => {
+          this.selection.map(l => {
+            if (l.id == k.id) {
+              this.$set(k, 'disabled', true)
             }
           })
         })
-        if (!this.dataList.length){
+        if (!this.dataList.length) {
           this.customerNumber = ''
         }
       }

+ 12 - 10
src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -3,22 +3,22 @@
     <el-page-header @back="$parent.pageType=0" :content="detailsId?'编辑':'新增'" style=" padding: 20px 20px 0 20px;"
     ></el-page-header>
     <return-sales-header ref="header" :details="details" />
-    <sales-table :dataList="dataList" :column="column" isOperation isSelection @handleSelection="handleSelection">
+    <sales-table :dataList="dataList" :column="column" :isOperation="detailsId?false:true" isSelection @handleSelection="handleSelection">
       <template #bts>
-        <div>
-          <el-button v-if="!this.detailsId" type="primary" size="mini" @click="dialogVisible=true">添加</el-button>
-          <el-button type="danger" size="mini" @click="delChange">删除</el-button>
+        <div v-if="!detailsId">
+          <el-button  type="primary" v-if="dis" size="mini" @click="dialogVisible=true">添加</el-button>
+          <el-button type="danger" v-if="dis" size="mini" @click="delChange">删除</el-button>
         </div>
       </template>
       <template #events>
         <div v-if="!detailsId">
           <el-button type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
-          <el-button size="mini" @click="onReset">重置</el-button>
+          <el-button size="mini" @click="onReset" v-if="dis">重置</el-button>
           <el-button size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
         </div>
         <div v-else>
           <el-button type="primary" size="mini" @click="handelSubmit(2)">保存</el-button>
-          <el-button size="mini" @click="onReset">重置</el-button>
+          <el-button size="mini" @click="onReset" v-if="!detailsId">重置</el-button>
         </div>
 
       </template>
@@ -31,6 +31,7 @@
       </template>
       <template v-slot:operation="{item:{row,$index}}">
         <el-popconfirm
+          v-if="dis"
           style="margin-left: 10px"
           title="删除?"
           @onConfirm="handleDel(row,$index)"
@@ -174,8 +175,8 @@ export default {
     },
     confirm(selected) {
       // console.log(selected)
-      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
-        selected.forEach(l=>{
+      this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.map(k=>{
+        selected.map(l=>{
           if ( l.id == k.id){
             // k.disabled = true
             this.$set(k,'disabled',false)
@@ -221,8 +222,8 @@ export default {
     delChange() {
       if (this.dataList.length) {
         this.dataList = this.resArr(this.dataList, this.selection)
-        this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.forEach(k=>{
-          this.selection.forEach(l=>{
+        this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.map(k=>{
+          this.selection.map(l=>{
             if ( l.id == k.id){
               this.$set(k,'disabled',true)
             }
@@ -239,6 +240,7 @@ export default {
     },
 
     handelSubmit(type, status = 1) {
+
       if (!this.dataList.length) {
         this.$errorMsg('请添加产品')
         return