Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/orderManage/details/index.vue

@@ -383,7 +383,20 @@ export default {
           label:'备货状态',
           value:this.$t(this.mainData.goodsstatus),
           style:function () {
-            let style = that.tool.getStatusColor(that.mainData.goodsstatus)
+            let style = {}
+            switch (that.mainData.goodsstatus) {
+              case '已完成':
+                style = {color:"#67C23A"}
+                break;
+              case '未完成':
+                style = {color:"#F56C6C"}
+                break;
+              case '部分完成':
+                style = {color:"#e6a23c"}
+                break;
+              default:
+                break;
+            }
             return style
           }
         },
@@ -524,7 +537,20 @@ export default {
           label:'备货状态',
           value:this.$t(this.mainData.goodsstatus),
           style:function () {
-            let style = that.tool.getStatusColor(that.mainData.goodsstatus)
+            let style = {}
+            switch (that.mainData.goodsstatus) {
+              case '已完成':
+                style = {color:"#67C23A"}
+                break;
+              case '未完成':
+                style = {color:"#F56C6C"}
+                break;
+              case '部分完成':
+                style = {color:"#e6a23c"}
+                break;
+              default:
+                break;
+            }
             return style
           }
         },

src/HDrpManagement/orderManage/index.vue

@@ -139,8 +139,11 @@
         <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 == 'goodsstatus'" :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
-          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        <div v-else-if="scope.data.column.columnname == 'goodsstatus'" >
+          <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'" style="color: #67C23A">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '未完成'" style="color: #F56C6C">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '部分完成'"  style="color: #e6a23c">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else  style="color: #606266">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?$t(scope.data.column.data[[scope.data.column.columnname]]):'--'}}

src/HDrpManagement/serveWorkBillTask/components/add.vue

@@ -49,7 +49,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`上传文本`)" prop="textedit">
+              <el-form-item :label="$t(`文本填写`)" prop="textedit">
                 <el-radio-group v-model="form.textedit">
                   <el-radio :label="11">{{ $t("必填") }}</el-radio>
                   <el-radio :label="1">{{ $t("非必填") }}</el-radio>

src/HDrpManagement/serveWorkBillTask/components/edit.vue

@@ -49,7 +49,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t(`上传文本`)" prop="textedit">
+              <el-form-item :label="$t(`文本填写`)" prop="textedit">
                 <el-radio-group v-model="form.textedit">
                   <el-radio :label="11">{{ $t("必填") }}</el-radio>
                   <el-radio :label="1">{{ $t("非必填") }}</el-radio>

src/HDrpManagement/serveWorkBillTask/modules/detail.vue

@@ -104,7 +104,7 @@ export default {
           },
         },
         {
-          label: "上传文本",
+          label: "文本填写",
           value: this.mainData.textedit
             ? this.mainData.textedit == 1
               ? "非必填"

src/SDrpManagement/agentOrder/details/index.vue

@@ -437,7 +437,20 @@ export default {
           label:'备货状态',
           value:this.$t(this.mainData.goodsstatus),
           style:function () {
-            let style = that.tool.getStatusColor(that.mainData.goodsstatus)
+            let style = {}
+            switch (that.mainData.goodsstatus) {
+              case '已完成':
+                style = {color:"#67C23A"}
+                break;
+              case '未完成':
+                style = {color:"#F56C6C"}
+                break;
+              case '部分完成':
+                style = {color:"#e6a23c"}
+                break;
+              default:
+                break;
+            }
             return style
           }
         },

src/SDrpManagement/agentOrder/index.vue

@@ -96,8 +96,11 @@
         <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 v-else-if="scope.data.column.columnname == 'goodsstatus'" >
+          <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'" style="color: #67C23A">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '未完成'" style="color: #F56C6C">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '部分完成'"  style="color: #e6a23c">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else  style="color: #606266">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}

src/SDrpManagement/salerOrder/details/index.vue

@@ -522,7 +522,20 @@ export default {
           label:'备货状态',
           value:this.$t(this.mainData.goodsstatus),
           style:function () {
-            let style = that.tool.getStatusColor(that.mainData.goodsstatus)
+            let style = {}
+            switch (that.mainData.goodsstatus) {
+              case '已完成':
+                style = {color:"#67C23A"}
+                break;
+              case '未完成':
+                style = {color:"#F56C6C"}
+                break;
+              case '部分完成':
+                style = {color:"#e6a23c"}
+                break;
+              default:
+                break;
+            }
             return style
           }
         },

src/SDrpManagement/salerOrder/index.vue

@@ -185,8 +185,11 @@
         <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 v-else-if="scope.data.column.columnname == 'goodsstatus'" >
+          <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'" style="color: #67C23A">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '未完成'" style="color: #F56C6C">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '部分完成'"  style="color: #e6a23c">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else  style="color: #606266">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else>
           {{ $t(scope.data.column.data[[scope.data.column.columnname]]) }}