zancun

src/HDrpManagement/ProductMag/modules/add.vue

@@ -56,11 +56,30 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="9">
-              <el-form-item label="换算率">
-                <el-input v-model="form.itemname" readonly></el-input>
+            <el-col :span="12">
+              <el-form-item label="领域">
+                <el-select style="width:100%" v-model="form.tradefields" multiple placeholder="请选择" clearable>
+                  <el-option
+                    v-for="item in tradefield"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
-            </el-col> -->
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品标准">
+                <el-select style="width:100%" v-model="form.standards" placeholder="请选择" clearable>
+                  <el-option
+                    v-for="item in standards"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="起订量" prop="orderminqty">
                 <el-input placeholder="起订量" v-model="form.orderminqty" class="input-with-select">
@@ -96,6 +115,31 @@
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.istool">是否工具</el-checkbox>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="压力等级">
+                <el-select style="width:100%" v-model="form.pressure" placeholder="请选择" clearable>
+                  <el-option
+                    v-for="item in pressures"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="材质">
+                <el-select style="width:100%" v-model="form.material" placeholder="请选择" clearable>
+                  <el-option
+                    v-for="item in itemmaterial"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            
             <el-col :span="12">
               <el-form-item label="毛重(g)">
                 <el-input v-model="form.grossweight" placeholder="输入产品毛重(g)"></el-input>
@@ -126,11 +170,26 @@
                 <el-input v-model="form.barcode" placeholder="输入条形码"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="满库存量">
+                <el-input v-model="form.stockstatus1" placeholder="满库存量"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="缺货提醒">
+                <el-input v-model="form.stockstatus2" placeholder="缺货提醒"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="交期">
                 <el-input v-model="form.delivery" placeholder="输入交期"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="保修期限">
+                <el-input v-model="form.warrantyday" placeholder="输入保修期限"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input v-model="form.remarks" type="textarea" placeholder="输入产品备注"></el-input>
@@ -217,13 +276,43 @@ export default {
       },
       unitGroupData:[],
       unitData:[],
-      bindData:{}
+      bindData:{},
+      tradefield:[],// 领域
+      standards:[],// 产品标准
+      pressures:[],// 压力等级
+      itemmaterial:[], // 材质
     }
   },
   methods:{
     onShow () {
       this.unitlist()
       this.unitGrouplist()
+      this.fieldData()
+      this.standardData()
+      this.pressureData()
+      this.itemmaterialData()
+    },
+    // 查询领域
+    async fieldData () {
+      const res = await this.$store.dispatch('optiontypeselect','tradefield')
+      this.tradefield = res.data
+    },
+    // 查询产品标准
+    async standardData () {
+      const res = await this.$store.dispatch('optiontypeselect','itemstandards')
+      this.standards = res.data
+    },
+
+    // 查询压力等级
+    async pressureData () {
+      const res = await this.$store.dispatch('optiontypeselect','pressurelevel')
+      this.pressures = res.data
+    },
+
+    // 查询材质
+    async itemmaterialData () {
+      const res = await this.$store.dispatch('optiontypeselect','itemmaterial')
+      this.itemmaterial = res.data
     },
     async unitlist () {
       const res = await this.$api.requested({
@@ -239,7 +328,7 @@ export default {
       })
       this.unitData = res.data
     },
-     async unitGrouplist () {
+    async unitGrouplist () {
        const res = await this.$api.requested({
         "id": "20220922084503",
         "version":1,

src/HManagement/department/staff/detail/modules/main.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="user-panel normal-margin">
-      <el-descriptions :column="5">
+      <el-descriptions :column="4">
           <div slot="title" class="flex-align-center flex-between">
             <span>账号信息</span>
             <div class="flex-align-center flex-between">
@@ -9,10 +9,10 @@
               <slot name="linkact" :data="mainInfo"></slot>
             </div>
           </div>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="账号名称">{{mainInfo.username?mainInfo.username:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="账号类型">{{mainInfo.usertypename?mainInfo.usertypename:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="角色">{{mainInfo.userrole?(mainInfo.userrole).toString():''}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="账号密码">
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="账号名称">{{mainInfo.username?mainInfo.username:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="账号类型">{{mainInfo.usertypename?mainInfo.usertypename:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="角色">{{mainInfo.userrole?(mainInfo.userrole).toString():''}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="账号密码">
             <div class="flex-align-center flex-between">
               *******
              <slot name="restpas"></slot>
@@ -22,11 +22,11 @@
     </div>
     <div class="">
       <el-descriptions title="系统信息" :column="4">
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="创建人">{{mainInfo.createby?mainInfo.createby:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="修改人">{{mainInfo.changeby?mainInfo.changeby:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="手机号">{{mainInfo.userphonenumber?mainInfo.userphonenumber:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="创建时间">{{mainInfo.createdate?mainInfo.createdate:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="修改时间">{{mainInfo.changedate?mainInfo.changedate:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="创建人">{{mainInfo.createby?mainInfo.createby:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="修改人">{{mainInfo.changeby?mainInfo.changeby:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="手机号">{{mainInfo.userphonenumber?mainInfo.userphonenumber:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="创建时间">{{mainInfo.createdate?mainInfo.createdate:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="修改时间">{{mainInfo.changedate?mainInfo.changedate:'--'}}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>

src/HManagement/marketing2/agent/details/index.vue

@@ -10,7 +10,7 @@
     delApiId="20221011145003"
     idname="sa_agentsid"
     :tags="[]"
-    :tabs="['经销商团队','代理区域','营销类别','账户余额查询','地址管理','联系人管理','财务信息','关联合同']"
+    :tabs="['经销商团队','代理区域','营销类别','账户余额查询','地址管理','联系人管理','财务信息','关联合同','授权领域']"
     @pageChange="pageChange"
     @onEditSuccess="queryMainData($route.query.id)">
     <div slot="tags">
@@ -45,6 +45,9 @@
     <div slot="slot7">
       <contract :data="mainData"></contract>
     </div>
+    <div slot="slot8">
+      <field :data="mainData"></field>
+    </div>
   </basicDetails>
 </template>
 
@@ -56,6 +59,7 @@ import agentAddress from './modules/address/list'
 import agentContact from './modules/contact/list'
 import contract from './modules/contract/index'
 import financial from '@/components/financialInfo/index.vue'
+import field from './modules/field/index.vue'
 export default {
   data () {
     return {
@@ -70,7 +74,8 @@ export default {
     agentAddress,
     agentContact,
     financial,
-    contract
+    contract,
+    field
   },
   methods:{
     async queryMainData (id) {

src/HManagement/marketing2/agent/details/modules/field/index.vue

@@ -0,0 +1,110 @@
+<template>
+    <div>
+      <el-button class="normal-margin" size="small" type="primary" @click="fieldList">授权领域</el-button>
+      <el-dialog
+        title="授权领域"
+        :visible.sync="dialogVisible"
+        width="400px"
+        append-to-body>
+        <el-table
+          :data="field"
+          style="width: 100%"
+          size="small">
+          <el-table-column
+            prop="value"
+            label="领域">
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="90">
+            <template slot-scope="scope">
+              <el-button type="text" size="mini" @click="authField(scope.row)">授权</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-dialog>
+      <el-table
+        :data="alfield"
+        style="width: 100%"
+        size="small"
+        border>
+        <el-table-column
+          prop="tradefield"
+          label="已授权领域"
+          width="120">
+        </el-table-column>
+        <el-table-column
+          label="操作">
+          <template slot-scope="scope">
+            <el-popconfirm
+              title="这是一段内容确定删除吗？"
+              @confirm="deleteField(scope.row)">
+              <el-button slot="reference" type="text" size="mini">删除</el-button>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+</template>
+<script>
+  export default {
+    props:['data'],
+    data () {
+      return {
+        field:[],
+        alfield:[],
+        dialogVisible:false,
+        param:{
+          "id": 20221223141802,
+          "content": {
+              "sys_enterpriseid": 0,
+              "pageNumber": 1,
+              "pageSize": 100,
+              "where": {
+                "condition": ""
+              }
+          },
+        }
+      }
+    },
+    methods:{
+      async fieldList () {
+        this.dialogVisible = true
+        const res = await this.$store.dispatch('optiontypeselect','tradefield')
+        this.field = res.data
+      },
+      async authField (row) {
+        const res = await this.$api.requested({
+          "id":20221223141602,
+          "content": {
+            "sys_enterpriseid": this.data.sys_enterpriseid,
+            "tradefield":row.value
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.dialogVisible = false
+          this.alreadyAuthField()
+        })
+      },
+      async alreadyAuthField () {
+        this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested(this.param)
+        this.alfield = res.data
+      },
+      async deleteField (row) {
+        const res = await this.$api.requested({
+          "id":20221223141702,
+          "content": {
+            "sys_enterprise_tradefieldids": [row.sys_enterprise_tradefieldid]
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.alreadyAuthField()
+        })
+      },
+    },
+    mounted () {
+      this.alreadyAuthField()
+    }
+  }
+</script>