Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/accountsReceivableMag/index.vue

@@ -19,7 +19,7 @@
             </div>
             <div  class="inline-16">
               <label class="search__label">{{$t(`入账节点`)}}:</label>
-              <btnGroup class="inline-16" :data="['全部','订单','出货','开票','质保金']" :select="select" @pointSelect="pointSelect"></btnGroup>
+              <btnGroup class="inline-16" :data="['全部','预付款','出货款','验收款','质保金']" :select="select" @pointSelect="pointSelect"></btnGroup>
             </div>
             <div>
               <el-row :gutter="20">
@@ -142,7 +142,15 @@ export default {
   },
   methods:{
     async listData(){
-      this.param.content.point = this.select
+      let nowSelect = this.select
+      if (this.select == '预付款'){
+        nowSelect = '订单'
+      }else if (this.select == '出货款'){
+        nowSelect = '出货'
+      }else if (this.select == '验收款'){
+        nowSelect = '开票'
+      }
+      this.param.content.point = nowSelect
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.allList = res.data.length > 0 ? res.data[0]:{}

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

@@ -297,7 +297,7 @@ export default {
   computed: {
     checkNB () {
       let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-      if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
+      if ((siteid === 'NB' || siteid === 'HY') && this.data.type === '特殊订单' && this.data.typemx === '样品') {
         return true
       } else {
         return false
@@ -697,7 +697,7 @@ export default {
     setTimeout(() => {
       /* 处理宁波站点 */
       let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-      if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
+      if ((siteid === 'NB' || siteid === 'HY') && this.data.type === '特殊订单' && this.data.typemx === '样品') {
         this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols
       } else {
         this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols.filter(item => {

src/HDrpManagement/orderManage/index.vue

@@ -161,7 +161,7 @@ export default {
     return {
       options:[],
       tradefieldList:'',
-      "siteid":JSON.parse(sessionStorage.getItem('active_account')).siteid,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       where: {
         "condition":"",
         "status2" : '',

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -196,7 +196,12 @@
               :param="param4"
               :custom="true"
             >
-              <template v-slot:custom="scope">{{$t(scope.data.data[scope.data.columnname]) || '--'}}</template>
+              <template v-slot:custom="scope">
+                <div v-if="scope.data.columnname === 'important'">
+                  <span>{{scope.data.data[scope.data.columnname] === 1 ? $t('是') : $t('否')}}</span>
+                </div>
+                <div v-else>{{$t(scope.data.data[scope.data.columnname]) || '--'}}</div>
+              </template>
             </pageTable>
             </showIsNone>
           </el-card>

src/HDrpManagement/serveBill/modules/product/add.vue

@@ -31,6 +31,15 @@
             <div v-if="scope.column.columnname === 'nominalpressure'">
               {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
             </div>
+            <div v-else-if="scope.column.columnname == 'itemno'">
+              {{scope.column.data[scope.column.columnname]}}
+              <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+                <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                  <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                  <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+                </div>
+              </div>
+            </div>
             <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>
         </selectTable>
@@ -97,11 +106,11 @@ export default {
           },
         },
       },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   computed: {},
   created() {
-    this.getOrderList();
     this.tablecols = this.tool.tabelCol(
       this.$route.name
     ).productTable.tablecols;
@@ -125,6 +134,7 @@ export default {
           itemid: item.itemid,
           reason: "",
           qty: 1,
+          traceabilitytype:item.traceabilitytype
         };
       });
       let res = await this.$api.requested({

src/HDrpManagement/serveBill/modules/product/index.vue

@@ -64,6 +64,15 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname == 'itemno'">
+            {{scope.column.data[scope.column.columnname]}}
+            <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+              <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+              </div>
+            </div>
+          </div>
           <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
@@ -123,6 +132,7 @@ export default {
       options: [],
       productList: "",
       currentProduct: {},
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   methods: {

src/HDrpManagement/serveBillMag/modules/product/add.vue

@@ -31,6 +31,15 @@
             <div v-if="scope.column.columnname === 'nominalpressure'">
               {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
             </div>
+            <div v-else-if="scope.column.columnname == 'itemno'">
+              {{scope.column.data[scope.column.columnname]}}
+              <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+                <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                  <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                  <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+                </div>
+              </div>
+            </div>
             <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>
         </selectTable>
@@ -97,6 +106,7 @@ export default {
           },
         },
       },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   computed: {
@@ -109,7 +119,6 @@ export default {
     },
   },
   mounted() {
-    this.getOrderList();
   },
   created() {
     this.tablecols = this.tool.tabelCol(
@@ -135,6 +144,7 @@ export default {
           itemid: item.itemid,
           reason: "",
           qty: 1,
+          traceabilitytype:item.traceabilitytype
         };
       });
       let res = await this.$api.requested({

src/HDrpManagement/serveBillMag/modules/product/index.vue

@@ -27,6 +27,15 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname == 'itemno'">
+            {{scope.column.data[scope.column.columnname]}}
+            <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+              <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+              </div>
+            </div>
+          </div>
           <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
@@ -75,7 +84,8 @@ export default {
       options:[
       ],
       productList:'',
-      currentProduct:{}
+      currentProduct:{},
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{

src/HDrpManagement/serveWorkBill/modules/items/index.vue

@@ -23,7 +23,17 @@
         height="50vh"
         border
       >
-        <el-table-column prop="itemno" :label="$t('编号')"> </el-table-column>
+        <el-table-column prop="itemno" :label="$t('编号')">
+          <template slot-scope="scope">
+            {{scope.row.itemno}}
+            <div v-if="siteid == 'HY' && scope.row.traceabilitytype && scope.row.traceabilitytype.length > 0">
+              <div v-for="item in scope.row.traceabilitytype" :key="item.index">
+                <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="itemname" :label="$t(`名称`)"> </el-table-column>
         <el-table-column prop="model" :label="$t('型号')"> </el-table-column>
         <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">

src/HManagement/department/staff/list/modules/edit.vue

@@ -105,7 +105,7 @@
             </el-col>
             <el-col  :span="5">
               <el-form-item>
-                <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" @change="salerChange">{{ $t('是否业务员') }}</el-checkbox>
+                <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" disabled>{{ $t('是否业务员') }}</el-checkbox>
               </el-form-item>
             </el-col>
           </el-row>
@@ -126,7 +126,7 @@
                   <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
                 </template>
                 <template v-slot:opreation="scope">
-                  <el-button type="text" @click="delArea(scope.data)">{{$t('删 除')}}</el-button>
+                  <el-button type="text" disabled>{{$t('删 除')}}</el-button>
                 </template>
               </tableNewLayout>
             </el-col>

src/SDrpManagement/accountsReceivable/index.vue

@@ -19,7 +19,7 @@
             </div>
             <div  class="inline-16">
               <label class="search__label">{{$t('入账节点')}}:</label>
-              <btnGroup class="inline-16" :data="['全部','订单','出货','开票','质保金']" :select="select" @pointSelect="pointSelect"></btnGroup>
+              <btnGroup class="inline-16" :data="['全部','预付款','出货款','验收款','质保金']" :select="select" @pointSelect="pointSelect"></btnGroup>
             </div>
             <div>
               <el-row :gutter="20">
@@ -141,7 +141,15 @@ export default {
   },
   methods:{
     async listData(){
-      this.param.content.point = this.select
+      let nowSelect = this.select
+      if (this.select == '预付款'){
+        nowSelect = '订单'
+      }else if (this.select == '出货款'){
+        nowSelect = '出货'
+      }else if (this.select == '验收款'){
+        nowSelect = '开票'
+      }
+      this.param.content.point = nowSelect
       const res = await this.$api.requested(this.param)
       console.log(res.data,'数据')
       this.list = res.data

src/SDrpManagement/agentOrder/index.vue

@@ -57,6 +57,14 @@
             <el-option value="未开票" :label="$t(`未开票`)"></el-option>
           </el-select>
         </div>
+        <div class="mt-10" v-if="siteid == 'HY'">
+          <p class="search__label">{{$t(`备货状态`)}}:</p>
+          <el-select v-model="goodsstatus" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择备货状态`)" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.goodsstatus = goodsstatus;$refs.basicLayout.listData()">
+            <el-option :label="$t(`已备货`)" value="已备货"></el-option>
+            <el-option :label="$t(`部分备货`)" value="部分备货"></el-option>
+            <el-option :label="$t(`未备货`)" value="未备货"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label" >{{$t('审核日期')}}:</label>
           <el-date-picker
@@ -83,6 +91,15 @@
         <div v-else-if="scope.data.column.columnname == 'defaultamount'">
           {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'writeoffstatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'invoicestatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'goodsstatus'" :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
         <div v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
         </div>
@@ -110,7 +127,9 @@ export default {
       type:'',
       writeoffstatus:'',
       invoicestatus:'',
-      dateSelect:[]
+      dateSelect:[],
+      goodsstatus:'',
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     }
   },
   methods:{

src/SDrpManagement/salerOrder/index.vue

@@ -120,6 +120,19 @@
             <el-option :label="$t(`未开票`)" value="未开票"></el-option>
           </el-select>
         </div>
+        <div class="mt-10" v-if="siteid == 'HY'">
+          <p class="search__label">{{$t(`备货状态`)}}:</p>
+          <el-select v-model="goodsstatus" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择备货状态`)" @change="
+              $refs.basicLayout.param.content.pageNumber = 1;
+              $refs.basicLayout.param.content.where.goodsstatus =
+                goodsstatus;
+              $refs.basicLayout.listData();
+            ">
+            <el-option :label="$t(`已备货`)" value="已备货"></el-option>
+            <el-option :label="$t(`部分备货`)" value="部分备货"></el-option>
+            <el-option :label="$t(`未备货`)" value="未备货"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label">{{ $t("审核日期") }}:</label>
           <el-date-picker
@@ -167,6 +180,15 @@
             `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}-${scope.data.column.data.address}`
           }}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'writeoffstatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'invoicestatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'goodsstatus'" :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
         <div v-else>
           {{ $t(scope.data.column.data[[scope.data.column.columnname]]) }}
         </div>
@@ -194,6 +216,8 @@ export default {
       writeoffstatus: "",
       invoicestatus: "",
       dateSelect: [],
+      goodsstatus:"",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     };
   },
   methods: {