客户档案详情、修改提的bug

src/Form/EnterpriseArchives/add.vue

@@ -6,7 +6,8 @@
         direction="rtl"
         append-to-body
         :visible.sync="dialogFormVisible"
-        size="20%">
+        size="20%"
+        @close="onCancel">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="85px" label-position="right" size="mini">
@@ -49,7 +50,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -66,7 +67,11 @@ export default {
       form:{
         enterprisename:'',
         value:[],
-        sys_enterpriseid:0
+        sys_enterpriseid:0,
+        taxno:'',
+        contact:'',
+        phonenumber:'',
+        address:'',
       },
       arealist:[],
       rules:{
@@ -110,9 +115,31 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
+          this.form = {
+            enterprisename:'',
+                value:[],
+                sys_enterpriseid:0,
+                taxno:'',
+                contact:'',
+                phonenumber:'',
+                address:'',
+          }
           this.dialogFormVisible = false
         })
      })
+    },
+    onCancel(){
+      this.$refs['form'].resetFields();
+      this.form = {
+        enterprisename:'',
+        value:[],
+        sys_enterpriseid:0,
+        taxno:'',
+        contact:'',
+        phonenumber:'',
+        address:'',
+      }
+      this.dialogFormVisible = false
     }
   },
   mounted () {

src/HDrpManagement/ProductGroupMag/index.vue

@@ -4,7 +4,6 @@
       style="padding-top:0 !important"
       ref="basicLayout" 
       :oldFormPath="{
-        edit:'HDrpManagement/ProductGroupMag/modules',
         add:'HDrpManagement/ProductGroupMag/modules',
       }"
       tableName="productGroupTable" 

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="drawer=true">新 建</el-button>
-    <el-drawer title="创建商品组" :visible.sync="drawer" size="40%" direction="rtl" append-to-body>
+    <el-drawer title="创建商品组" :visible.sync="drawer" size="40%" direction="rtl" append-to-body @close="onCancel">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
@@ -45,7 +45,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -175,6 +175,17 @@ export default {
       this.params.content.pageNumber = val
       this.getProductList()
     },
+    onCancel(){
+      this.drawer = false
+      this.$refs.form.resetFields()
+      this.$refs.table.allArr = []
+      this.form={
+        sa_brandid: '',
+        groupname: '',
+        itemno: '',
+        tag: []
+      }
+    },
     clearData(){
       this.search = ""
     },

src/HDrpManagement/ProductGroupMag/modules/addGroupDetailBtn.vue

@@ -17,24 +17,27 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
+                <label class="inline-16" style="font-size: 14px">可选商品:</label>
+                <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @input="queryClick" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px;float: right" size="small" class="input-with-select inline-16" clearable>
+                </el-input>
+              </el-col>
               <el-col :span="24">
-                <el-form-item label="商品" prop="itemno">
-                  <el-input style="width:200px;margin-bottom:10px" size="small" placeholder="请输入商品" @clear="getProductList(params.content.pageNumber=1)"
-                    @keyup.native.enter="getProductList(params.content.pageNumber=1)" v-model="params.content.where.condition" clearable />
-                  <Table ref="table" v-model="form.itemno" :layout="tablecols" :data="productList" :custom="false" height="500px" @upDateData="upDateData">
-                  </Table>
+                <Table ref="table" v-model="form.itemno" :layout="tablecols" :data="productList" :custom="false" height="500px"  @upDateData="upDateData">
+                </Table>
+                <div class="container normal-panel" style="text-align:right">
                   <el-pagination
-                    style="text-align:right"
-                    background
-                    small
-                    @size-change="handleSizeChange"
-                    @current-change="handleCurrentChange"
-                    :current-page="params.content.pageNumber"
-                    :page-size="params.content.pageSize"
-                    layout="total, prev, pager, next, jumper"
-                    :total="total">
+                      style="text-align:right"
+                      background
+                      small
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange"
+                      :current-page="params.content.pageNumber"
+                      :page-sizes="[20, 50, 100, 200]"
+                      layout="total,sizes, prev, pager, next, jumper"
+                      :total="total">
                   </el-pagination>
-                </el-form-item>
+                </div>
               </el-col>
             </el-form>
           </el-row>
@@ -61,6 +64,7 @@ export default {
       productList:[],
       tablecols:[],
       total:0,
+      search:'',
       form: {
         sa_brandid: '',
         groupname: '',
@@ -162,6 +166,13 @@ export default {
       this.params.content.pageNumber = val
       this.getProductList()
     },
+    clearData(){
+      this.search = ""
+    },
+    queryClick(){
+      this.params.content.where.condition = this.search
+      this.getProductList()
+    }
   }
 }
 

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -13,7 +13,7 @@
         @onEditSuccess="queryMainData($route.query.id)"
         :statusCheck="[{key:'isonsale',value:1}]">
       <div slot="customOperation">
-        <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData" :disabled="mainData.isonsale"/>
+<!--        <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData" :disabled="mainData.isonsale"/>-->
         <shelves class="inline-16" @upSuccess="queryMainData" :data="mainData"></shelves>
 <!--        <el-popover placement="bottom" style="20px">
           <Up type="one" @upSuccess="queryMainData" ":id="[mainData.sa_itemgroupid] v-if="mainData.isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
@@ -21,7 +21,7 @@
           <el-button size="mini" slot="reference" icon="el-icon-more"></el-button>
         </el-popover>-->
       </div>
-      <div slot="slot0" class="container normal-panel">
+      <div slot="slot0" >
         <addGroupDetail :disabled="mainData.isonsale" v-if="mainData" :rowData="mainData"/>
       </div>
     </basicDetails>

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -18,9 +18,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
+             <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
               <label class="inline-16" style="font-size: 14px">可选商品:</label>
-              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px;float: right" size="small" class="input-with-select inline-16" clearable>
+              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @input="queryClick" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px;float: right" size="small" class="input-with-select inline-16" clearable>
               </el-input>
             </el-col>
             <el-col :span="24">
@@ -39,7 +39,7 @@
                     :total="total">
                 </el-pagination>
               </div>
-            </el-col> -->
+            </el-col>
           </el-form>
         </el-row>
       <div slot="footer" class="dialog-footer">

src/HDrpManagement/ProductMag/detail/index.vue

@@ -2,30 +2,31 @@
   <div>
     <basicDetails
         ref="details"
-        :titleText="`${mainData.accountno}-${mainData.name}`"
+        :titleText="mainData.itemname"
         :oldFormPath="{edit:'HDrpManagement/ProductMag/modules'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
-        turnPageId="20221031141102"
-        idname="userid"
-        ownertable="sys_users"
+        turnPageId="20220923140602"
+        idname="itemid"
+        ownertable="plm_item"
         tags=""
-        :tabs="['员工信息','角色信息']"
+        :tabs="['详细信息']"
         @pageChange="pageChange"
-        @onEditSuccess="queryMainData($route.query.id)">
+        @onEditSuccess="queryMainData($route.query.id)"
+        @onTabClick="onTabClick">
       <div slot="tags">
       </div>
       <div slot="customOperation" >
       </div>
       <div slot="slot0" >
-      </div>
-      <div slot="slot1" >
+        <detail_data ref="detail"></detail_data>
       </div>
     </basicDetails>
   </div>
 </template>
 
 <script>
+import detail_data from './modules/detailedData'
 export default {
   name: "index",
   data() {
@@ -34,24 +35,69 @@ export default {
       mainAreaData:{}
     }
   },
-  components:{
-  },
+  components:{detail_data},
   methods: {
     async queryMainData(id) {
       const res = await this.$api.requested({
-        "classname": "webmanage.users.users",
-        "method": "query_userMain",
+        "id": 20220923155302,
         "content": {
-          "userid": this.$route.query.id
-        }
+          "itemid": id
+        },
       })
       this.mainData = res.data
+      this.changeDataStructure()
+      console.log(this.mainData)
+      this.$refs.detail.detailedList(this.mainData)
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
       this.$router.replace({path:'/productmagDetail',query:{id:id,rowindex:rowindex}})
       this.queryMainData(id)
     },
+    changeDataStructure(){
+      this.mainAreaData = [
+        {
+          label:'产品名称',
+          value:this.mainData.itemname
+        },
+        {
+          label:'产品编号',
+          value:this.mainData.itemno
+        },
+        {
+          label:'型号',
+          value:this.mainData.model
+        },
+        {
+          label:'规格',
+          value:this.mainData.spec
+        },
+        {
+          label:'起订量',
+          value:this.mainData.orderminqty
+        },
+        {
+          label:'增量',
+          value:this.mainData.orderaddqty
+        },
+        {
+          label:'计量单位',
+          value:this.mainData.unitname
+        },
+        {
+          label:'状态',
+          value:this.mainData.status
+        }
+      ]
+    },
+    onTabClick(){
+      this.$nextTick(e=>{
+        this.refs.detail? this.$refs.detail.detailedList(this.mainData):''
+      })
+    }
+  },
+  mounted() {
+    this.queryMainData(this.$route.query.id)
   }
 }
 </script>

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <div class="normal-margin">
+      <el-descriptions :column="2" labelClassName="my-label" contentClassName="my-content" border>
+        <div slot="title" class="my-label__title">基本信息</div>
+        <el-descriptions-item  label="产品名称">{{ basic.itemname?basic.itemname:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="产品编号">{{ basic.itemno?basic.itemno:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="型号">{{ basic.model?basic.model:"--"}}</el-descriptions-item>
+        <el-descriptions-item label="规格">{{ basic.spec?basic.spec:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="起订量">{{ basic.orderminqty?basic.orderminqty:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="增量">{{ basic.orderaddqty?basic.orderaddqty:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="计量单位">{{ basic.unitname?basic.unitname:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="状态">{{ basic.status?basic.status:"--" }}</el-descriptions-item>
+      </el-descriptions>
+    </div>
+
+    <div>
+      <el-descriptions :column="2" labelClassName="my-label" contentClassName="my-content" border>
+        <div slot="title" class="my-label__title">系统信息</div>
+        <el-descriptions-item label="创建人">{{ basic.createby?basic.createby:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="创建时间">{{ basic.createdate?basic.createdate:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="最近编辑人">{{ basic.changeby?basic.changeby:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="最近编辑时间">{{ basic.changedate?basic.changedate:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="审核人">{{ basic.checkby?basic.checkby:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="审核时间">{{ basic.checkdate?basic.checkdate:"--" }}</el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detailedData",
+  props:["data"],
+  data(){
+    return {
+      basic:[],
+    }
+  },
+  mounted() {
+    /*this.basicData(this.data)
+    this.systemData(this.data)*/
+  },
+  methods:{
+    detailedList(data){
+      console.log("输出")
+      console.log(data)
+      this.basic = data
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/ProductMag/index.vue

@@ -22,7 +22,7 @@
         <counter_examine class="inline-16" :rowData="rowData" @examineSuccess="onSuccess"></counter_examine>
       </div>
       <div slot="custom">
-        <label  class="search__label">是否上架:</label>
+        <label  class="search__label" style="width: 60px">是否上架:</label>
         <el-select class="inline-24" v-model="selectParam.isonsale" placeholder="请选择是否上架" @change="selectChange" size="small" clearable>
           <el-option
               v-for="item in isOnSaleData"
@@ -31,7 +31,7 @@
               :value="item.value">
           </el-option>
         </el-select>
-        <label  class="search__label">状态:</label>
+        <label  class="search__label" style="width: 35px">状态:</label>
         <el-select class="inline-24" v-model="selectParam.status" placeholder="请选择状态" @change="selectChange" size="small" clearable>
           <el-option
               v-for="item in statusData"

src/HDrpManagement/ProductMag/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="onShow(dialogFormVisible=true)" >新增产品</el-button>
-    <el-drawer append-to-body title="新增产品" :visible.sync="dialogFormVisible" size="50%">
+    <el-drawer append-to-body title="新增产品" :visible.sync="dialogFormVisible" size="50%" @close="onCancel">
       <div class="drawer__panel" >
         <el-row :gutter="10">
           <el-form label-position="right" label-width="80px" :model="form" :rules="rules" ref="form" size="small">
@@ -152,7 +152,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -263,6 +263,31 @@ export default {
             usetype:'default'
           }
           this.$refs['form'].resetFields();
+          this.form={
+            "attinfos":[],
+            "itemid":0,
+            "isauxunit":0,
+            "unitid":'',
+            "unitgroupid":'',
+            "itemno":'',
+            "itemname":'',
+            "model": "",
+            "spec": "",
+            "orderminqty": '', //订单起订量
+            "orderaddqty": '', //订单增量
+            "orderminqty_auxunit": 0, //订单起订量控制单位（0:主单位；1:辅助单位）
+            "orderaddqty_auxunit": 0, //订单增量控制单位（0:主单位；1:辅助单位
+            "remarks": "", //可选
+            "barcode": "", //可选
+            "skucontrol": 0, //可选
+            "batchcontrol": 1, //可选
+            "grossweight": '', //可选
+            "weight": '', //可选
+            "height": '', //可选
+            "width": '', //可选
+            "length": '' //可选
+
+          }
           
           this.$refs['upload'].toUpload()
          
@@ -271,6 +296,35 @@ export default {
       })
       
     },
+    onCancel(){
+      this.dialogFormVisible = false
+      this.$refs['form'].resetFields();
+      this.form={
+        "attinfos":[],
+            "itemid":0,
+            "isauxunit":0,
+            "unitid":'',
+            "unitgroupid":'',
+            "itemno":'',
+            "itemname":'',
+            "model": "",
+            "spec": "",
+            "orderminqty": '', //订单起订量
+            "orderaddqty": '', //订单增量
+            "orderminqty_auxunit": 0, //订单起订量控制单位（0:主单位；1:辅助单位）
+            "orderaddqty_auxunit": 0, //订单增量控制单位（0:主单位；1:辅助单位
+            "remarks": "", //可选
+            "barcode": "", //可选
+            "skucontrol": 0, //可选
+            "batchcontrol": 1, //可选
+            "grossweight": '', //可选
+            "weight": '', //可选
+            "height": '', //可选
+            "width": '', //可选
+            "length": '' //可选
+
+      }
+    },
     unitChange () {
        this.unitGrouplist()
     },

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="inline-16">
+  <div >
     <el-button  :disabled="form.status==='审核'" size="mini" @click="onShow">编 辑</el-button>
     <el-drawer append-to-body title="编辑产品" :visible.sync="dialogFormVisible" size="50%">
       <div class="drawer__panel" >

src/HDrpManagement/prodectFileData/modules/add.vue

@@ -7,7 +7,7 @@
       size="30%"
       direction="rtl"
       append-to-body
-      @close="onClose"
+      @close="onCancel"
       >
       <div class="drawer__panel">
         <el-row :gutter="20">
@@ -44,7 +44,7 @@
           </file_table>
         </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit"   class="normal-btn-width btn-primary">确 定</el-button>
       </div>
       </div>
@@ -129,6 +129,16 @@ export default {
         })
       })
     },
+    onCancel(){
+      this.drawer = false
+      this.$refs.form.resetFields()
+      this.plm_technicalinfoid = ''
+      this.form = {
+        type:'',
+        remarks:'',
+        attinfos:[]
+      }
+    },
     /*资料类别明细*/
     async typeDetails(){
       const res = await this.$api.requested({

src/HManagement/marketing2/salerScope/index.vue

@@ -35,8 +35,8 @@
         <template v-slot:tbList="scope">
 <!--          {{scope.data.column.columnname}}-->
           <div v-if="scope.data.column.columnname === 'isused' ">
-            <p v-if="scope.data.column.columnname.data === 1">启用</p>
-            <p v-else-if="scope.data.column.columnname.data === 0">停用</p>
+            <p v-if="scope.data.column.data.isused=== 1">启用</p>
+            <p v-else-if="scope.data.column.data.isused === 0">停用</p>
             <p v-else>--</p>
           </div>
           <div v-else>

src/SManagement/project_target/modules/detailInfo.vue

@@ -13,8 +13,8 @@
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)"
       @onTabClick="onTabClick"
-      :noPageChange="false"
-      :hideTags="false"
+      :pageChange="true"
+      :hideTags="true"
       >
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
@@ -29,7 +29,9 @@
 
     <div slot="slot0">
       <div>
-        <project_add :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable"></project_add>
+        <project_add :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable" class="inline-16"></project_add>
+        <el-input  style="width:200px;" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="params.content.where.condition" @keyup.native.enter="getprojectTargetList(params.content.pageNumber = 1)" @clear="getprojectTargetList(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16" clearable>
+        </el-input>
       </div>
       <tableLayout ref="list" :layout="tablecols" :data="list" :custom="true" height="300">
 <!--        <template v-slot:customcol="scope">
@@ -103,7 +105,7 @@ export default {
     return {
       pickerOptions:{
         disabledDate(time){
-          return ((time.getMonth() +1) < (new Date().getMonth() +1) && (time.getFullYear() > (new Date().getFullYear())))
+          return time.getTime() < Date.now()
         }
       },
       disable:false,
@@ -206,6 +208,9 @@ export default {
       })
 
     },
+    searchChange(){
+      this.getprojectTargetList()
+    },
     onSuccess(){
       this.queryMainData(this.$route.query.id)
     },
@@ -236,22 +241,36 @@ export default {
       console.log(this.date)
       const dateNow = new Date(this.date)
       const month = dateNow.getMonth() +1
-      console.log(month)
-      this.saveShow = false
-      this.editShow = true
-      this.actindex = 0
-      const res = await this.$api.requested({
-        "id": 20220906112602,
-        "content": {
-          "sa_salestargetid": row.sa_salestargetid,
-          "target_l": row.target_l,
-          "target_h": row.target_h,
-          "month":month
-        },
-      })
-      this.tool.showMessage(res,()=>{
-        this.getprojectTargetList()
-      })
+      const datenow = new Date()
+        if (dateNow.getFullYear() !== datenow.getFullYear()){
+          this.$alert('只能选取今年的月份，请重新进行选择', '标题名称', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.$message({
+                type: 'info',
+                message: `重新选择月份`
+              });
+            }
+          });
+      }else {
+        console.log(month)
+        this.saveShow = false
+        this.editShow = true
+        this.actindex = 0
+        const res = await this.$api.requested({
+          "id": 20220906112602,
+          "content": {
+            "sa_salestargetid": row.sa_salestargetid,
+            "target_l": row.target_l,
+            "target_h": row.target_h,
+            "month":month
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.getprojectTargetList()
+        })
+      }
+
     }
   },
   created() {