Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

package-lock.json

@@ -11728,6 +11728,15 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "flv.js": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+      "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+      "requires": {
+        "es6-promise": "^4.2.8",
+        "webworkify-webpack": "^2.1.5"
+      }
+    },
     "follow-redirects": {
       "version": "1.11.0",
       "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.11.0.tgz",
@@ -22420,6 +22429,11 @@
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
       "dev": true
     },
+    "webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz",

src/views/contractManagement/acquisitionContract.vue

@@ -191,14 +191,14 @@
             <el-link v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus&& scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus&& scope.row.approveStatus!='发起人撤回'">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`

src/views/contractManagement/collectionContract.vue

@@ -121,14 +121,14 @@
             <el-link v-hasPermission="
               `contractManagement.dsContract.dsContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dsContract.dsContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dsContract.dsContractInfo.edit`

src/views/contractManagement/purchaseContract.vue

@@ -211,14 +211,14 @@
             <el-link v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="(scope.row.approveStatus!=null)">编辑</el-link>
+              :disabled="(scope.row.approveStatus!=null && scope.row.approveStatus!='发起人撤回')">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="(scope.row.approveStatus!=null)">删除</el-link>
+              :disabled="(scope.row.approveStatus!=null && scope.row.approveStatus!='发起人撤回')">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`

src/views/contractManagement/salesContract.vue

@@ -228,14 +228,14 @@
             <el-link v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" >删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.edit`

src/views/contractManagement/storageContract.vue

@@ -122,14 +122,14 @@
             <el-link v-hasPermission="
               `contractManagement.dcContract.dcContractInfo.edit`
             " target="_blank" type="primary" :underline="false" @click="handleEdit(scope.row)"
-              :disabled="scope.row.approveStatus">编辑</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">编辑</el-link>
               <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dcContract.dcContractInfo.delete`
             "><el-link target="_blank" type="primary" :underline="false" @click="handleDelete(scope.row)"
-              :disabled="scope.row.approveStatus">删除</el-link>
+              :disabled="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'">删除</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item v-hasPermission="
               `contractManagement.dcContract.dcContractInfo.edit`

src/views/outboundManagement/weighingManagementNew.vue

@@ -696,6 +696,12 @@
         
           this.ewCustomerOptions= [
           {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        },{
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
         }, {

src/views/outboundManagement/weighingManagementrecord.vue

@@ -431,6 +431,12 @@
         
           this.ewCustomerOptions= [
           {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        },{
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
         }, {