Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui into qin

components/customTable/customTable.vue

@@ -290,12 +290,6 @@ export default {
           title: '紧急程度',
           key: 'urgencyLevel',
           width: 100,
-           filters: this.getArry(
-            this.$store.getters.dictionaryByKey('plan.order.urgencyLevel')
-          ),
-          filterMethod(value, row) {
-            return row.urgencyLevel.indexOf(value) > -1
-          },
           render: (h, params) => {
             return h('state', {
               props: {

pages/aps/plan/index.vue

@@ -158,7 +158,8 @@ export default {
           title: this.l("urgencyLevel"),
           align: "left",
           easy: true,
-          high: true
+          high: true,
+          code: "plan.order.urgencyLevel",
         },
 
         {

pages/crm/contract/detail.vue

@@ -5,7 +5,7 @@
       <Filed :span="12" :name="l('name')">{{entity.name}} </Filed>
       <Filed :span="12" :name="l('userId')"><User :value="entity.userId" /></Filed>
       <Filed :span="12" :name="l('proceeds')">{{entity.proceeds}}</Filed>
-      <Filed :span="12" :name="l('status')"><state code="crm.contract.status" :value="entity.status" type="text"></state></Filed>
+      <Filed :span="24" :name="l('status')"><state code="crm.contract.status" :value="entity.status" type="text"></state></Filed>
        <Filed :span="24" :name="l('accessory')"><files ref="refFile" :parms="parms" unClosable style="display:inline" /></Filed>
       <Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
     </Row>

static/config.js

@@ -47,8 +47,8 @@ const systemApi = {
   window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
   window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
   window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径
-  window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
   window.apsManualUrl = `http://${apsAdress}:10091/api/services/app`;//aps手工排产
+  window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
   //oidc配置：
   window.authConfig = {
     authority: `http://${address}:10010`,