2023-3-2 冲突解决

src/HDrpManagement/bankStatement/index.vue

@@ -10,7 +10,8 @@
       :options="options"
       :detailPath="{
         path:'/bankStatementDetail'
-      }">
+      }"
+      @listData="list">
       <div slot="custom">
         <div class="label_center">
           <p class="search__label">状态:</p>
@@ -22,6 +23,12 @@
           </el-select>
         </div>
       </div>
+      <div slot="custom-right">
+        <div class="label_center">
+          <p class="search__label" style="width:200px">最新数据更新时间:</p>
+          <el-input readonly v-model="time" size="small"></el-input>
+        </div>
+      </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.data[[scope.data.column.columnname]]">
           <span v-if="scope.data.column.columnname == 'status'">
@@ -47,11 +54,14 @@ export default {
   data () {
     return {
       options:[],
-      status:''
-      
+      status:'',
+      time:'暂无'
     }
   },
   methods:{
+    list (data) {
+      if (data.length) this.time = data[0].lastruntime
+    }
   }
 }
 

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -31,7 +31,6 @@
             </template>
           </Table>
            <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
-            <span>已添加产品数:{{addProductLength}}</span>
 <!--            <el-pagination
                 style="display:inline-block"
                 background
@@ -81,7 +80,7 @@ export default {
         "content": {
             "sa_contractid": '',
             "pageNumber": 1,
-            "pageSize": 99999,
+            "pageSize": 20,
             "where": {
                 "condition": ""
             }
@@ -103,6 +102,8 @@ export default {
   },
   methods: {
     selectArr (data) {
+      console.log(data,data.length);
+      
       this.selectProductLength = data.length
     },
     addBtn () {

src/HDrpManagement/contractManage/index.vue

@@ -101,6 +101,9 @@
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '工具借用'">工具使用协议</span>
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '居间'">居间协议</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'signamount'">
+          <span>{{ tool.formatAmount(scope.data.column.data.signamount,1) }}</span>
+        </div>
         <div  v-else-if="scope.data.column.columnname == 'discountrate'">
 <!--          <div v-if="scope.data.column.data"></div>-->
 <!--          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}-->

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -321,7 +321,7 @@ export default {
     checkNB () {
       let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
-        return false
+        return true
       } else {
         return false
       }

src/HDrpManagement/writeoffbill/modules/detail.vue

@@ -142,6 +142,10 @@ export default {
             return style
           }
         },
+        {
+          label:'备注',
+          value:this.mainData.remarks
+        },
       ]
       this.detailInfo = {
         baseInfo: [
@@ -196,6 +200,10 @@ export default {
               return style
             }
           },
+          {
+            label:'备注',
+            value:this.mainData.remarks
+          },
         ],
         systemInfo: [
           {label:'创建人',value:this.mainData.createby},

src/SDrpManagement/agentOrder/details/index.vue

@@ -17,8 +17,22 @@
         <div slot="customOperation" class="inline-16">
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
           <el-button :disabled="mainData.status !== '交期待确认'"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
+<<<<<<< HEAD
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
           <el-button v-if="tool.checkAuth($route.name,'reback')" :disabled="mainData.status !== '提交'" type="primary" size="mini" @click="reback">撤 回</el-button>
+=======
+          <el-button class="inline-16" v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
+          <customBtn 
+            btnName="撤回"
+            message="确认撤回当前订单吗?"
+            idName="20230301190202"
+            keyName="sa_orderid"
+            :id="$route.query.id"
+            @onSuccess="queryMainData"
+            class="inline-16"
+            v-if="mainData.status == '提交' && tool.checkAuth($route.name,'reback')"
+          />
+>>>>>>> xiaoqin
           <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
           
       </div>
@@ -28,7 +42,11 @@
       <div slot="slot0">
         <product-list :data="mainData" ref="prod" @qtyChange="queryMainData" @onSuccess="queryMainData">
           <div slot="operation">
+<<<<<<< HEAD
             <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @onSuccess="bindImportOrder"></importFile>
+=======
+            <importFile class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" @onSuccess="bindImportOrder"></importFile>
+>>>>>>> xiaoqin
           </div>
         </product-list>
       </div>

src/SDrpManagement/salerOrder/details/index.vue

@@ -17,8 +17,22 @@
         <div slot="customOperation" class="inline-16">
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
           <el-button :disabled="mainData.status !== '交期待确认'"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
+<<<<<<< HEAD
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
           <el-button v-if="tool.checkAuth($route.name,'reback')" :disabled="mainData.status !== '提交'" type="primary" size="mini" @click="reback">撤 回</el-button>
+=======
+          <el-button class="inline-16" v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
+          <customBtn 
+            btnName="撤回"
+            message="确认撤回当前订单吗?"
+            idName="20230301190202"
+            keyName="sa_orderid"
+            :id="$route.query.id"
+            @onSuccess="queryMainData"
+            class="inline-16"
+            v-if="mainData.status == '提交' && tool.checkAuth($route.name,'reback')"
+          />
+>>>>>>> xiaoqin
           <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
       </div>
       <div slot="slot1">
@@ -27,7 +41,11 @@
       <div slot="slot0">
         <product-list :data="mainData" @onSuccess="queryMainData($route.query.id)" ref="prod">
           <div slot="operation">
+<<<<<<< HEAD
             <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @onSuccess="bindImportOrder"></importFile>
+=======
+            <importFile class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @onSuccess="bindImportOrder"></importFile>
+>>>>>>> xiaoqin
           </div>
         </product-list>
       </div>

src/SManagement/user/user-info/components/baseInfo.vue

@@ -48,7 +48,8 @@ export default {
         "content": {
           "name":'',
           "phonenumber":'',
-          "email":''
+          "email":'',
+          "password":''
         }
       },
       ruleForm: {
@@ -63,7 +64,7 @@ export default {
          { required: true, message: '请输入姓名', trigger: 'blur' }
         ],
         phonenumber:[
-         { required: true, message: '请输入手机号', trigger: 'blur' },
+        //  { required: true, message: '请输入手机号', trigger: 'blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         email:[

src/components/normal-basic-layout/index.vue

@@ -36,6 +36,7 @@
           <slot name="custom"></slot>
           <el-input v-if="!hideSearch" style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="clearSearchValue" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
+          <slot name="custom-right"></slot>
         </div>
       </div>
       <div class="normal-panel flex-align-center" style="padding:0 16px">

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites